From 8c23db5ce0973396f179ccec8cacdf304525dcdc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Dec 2013 08:01:00 +0100 Subject: first version with test --- apt-pkg/sourcelist.cc | 46 +++++++++++++++++++++++++++----- test/integration/test-apt-sources-deb822 | 45 +++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 6 deletions(-) create mode 100755 test/integration/test-apt-sources-deb822 diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 0fd237cad..1261ebb52 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -242,16 +243,49 @@ bool pkgSourceList::Read(string File) /* */ bool pkgSourceList::ReadAppend(string File) { + // try reading as deb822 + // FIXME: proper error handling so that we do not error for good old-style + // sources + FileFd Fd(File, FileFd::ReadOnly); + pkgTagFile Sources(&Fd); + if (_error->PendingError() == false) + { + pkgTagSection Tags; + map Options; + int i=0; + while (Sources.Step(Tags) == true) + { + if(!Tags.Exists("Type")) + continue; + string const type = Tags.FindS("Type"); + Type *Parse = Type::GetType(type.c_str()); + if (Parse == 0) + return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,File.c_str()); + + string URI = Tags.FindS("URL"); + if (!Parse->FixupURI(URI)) + return _error->Error(_("Malformed stanza %lu in source list %s (URI parse)"),i,File.c_str()); + string const Dist = Tags.FindS("Dist"); + string const Section = Tags.FindS("Section"); + // check if there are any options we support + const char* option_str[] = { + "arch", "arch+", "arch-", "trusted" }; + for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) + if (Tags.Exists(option_str[j])) + Options[option_str[j]] = Tags.FindS(option_str[j]); + Parse->CreateItem(SrcList, URI, Dist, Section, Options); + i++; + } + // we are done + if(i>0) + return true; + } + // Open the stream for reading ifstream F(File.c_str(),ios::in /*| ios::nocreate*/); if (!F != 0) return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str()); - -#if 0 // Now Reset() does this. - for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) - delete *I; - SrcList.erase(SrcList.begin(),SrcList.end()); -#endif + // CNC:2003-12-10 - 300 is too short. char Buffer[1024]; diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 new file mode 100755 index 000000000..cdf30c02a --- /dev/null +++ b/test/integration/test-apt-sources-deb822 @@ -0,0 +1,45 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +BASE="Type: deb +URL: http://ftp.debian.org/debian +Dist: stable +Section: main +Comment: Some random string + that can be very long" + +# simple case +echo "$BASE" > rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + + +# Two entries +echo "$BASE" > rootdir/etc/apt/sources.list +echo "" >> rootdir/etc/apt/sources.list +echo "$BASE" | sed s/stable/unstable/ >> rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 +'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris + + +# ARCH option +echo "$BASE" > rootdir/etc/apt/sources.list +echo "Arch: amd64,armel" >> rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris -- cgit v1.2.3 From ab2071eba830a092c5d5a0dd33ad94b4a9476109 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Dec 2013 08:21:49 +0100 Subject: add unittest for new sourceslist parser as well --- test/libapt/makefile | 6 +++++ test/libapt/sourcelist_test.cc | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 test/libapt/sourcelist_test.cc diff --git a/test/libapt/makefile b/test/libapt/makefile index 73403b24c..a8e053d6e 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -111,3 +111,9 @@ SLIBS = -lapt-pkg SOURCE = tagfile_test.cc include $(PROGRAM_H) +# test sourcelist +PROGRAM = SourceList${BASENAME} +SLIBS = -lapt-pkg +SOURCE = sourcelist_test.cc +include $(PROGRAM_H) + diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc new file mode 100644 index 000000000..6e83d08e0 --- /dev/null +++ b/test/libapt/sourcelist_test.cc @@ -0,0 +1,52 @@ +#include +#include + +#include "assert.h" +#include +#include +#include + +char *tempfile = NULL; +int tempfile_fd = -1; + +void remove_tmpfile(void) +{ + if (tempfile_fd > 0) + close(tempfile_fd); + if (tempfile != NULL) { + unlink(tempfile); + free(tempfile); + } +} + +int main(int argc, char *argv[]) +{ + const char contents[] = "" + "Type: deb\n" + "URL: http://ftp.debian.org/debian\n" + "Dist: stable\n" + "Section: main\n" + "Comment: Some random string\n" + " that can be very long\n" + "\n" + "Type: deb\n" + "URL: http://ftp.debian.org/debian\n" + "Dist: unstable\n" + "Section: main non-free\n" + ; + + FileFd fd; + tempfile = strdup("apt-test.XXXXXXXX"); + tempfile_fd = mkstemp(tempfile); + + /* (Re-)Open (as FileFd), write and seek to start of the temp file */ + equals(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite), true); + equals(fd.Write(contents, strlen(contents)), true); + equals(fd.Seek(0), true); + + pkgSourceList sources(tempfile); + equals(sources.size(), 2); + + /* clean up handled by atexit handler, so just return here */ + return 0; +} -- cgit v1.2.3 From 41c24955e8aa1303071348d77f661742270d05c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Dec 2013 08:36:10 +0100 Subject: fix section adding --- apt-pkg/sourcelist.cc | 11 ++++++++++- test/integration/test-apt-sources-deb822 | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 1261ebb52..4883e2fab 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -273,7 +273,16 @@ bool pkgSourceList::ReadAppend(string File) for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) if (Tags.Exists(option_str[j])) Options[option_str[j]] = Tags.FindS(option_str[j]); - Parse->CreateItem(SrcList, URI, Dist, Section, Options); + + // now create one item per section + std::vector list; + if (Section.find(",")) + list = StringSplit(Section, ","); + else + list = StringSplit(Section, " "); + for (int i=0; i < list.size(); i++) + Parse->CreateItem(SrcList, URI, Dist, list[i], Options); + i++; } // we are done diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index cdf30c02a..6e9700bb0 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -22,6 +22,16 @@ testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages. 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris +# two sections (we support both "," and " " as seperator) +echo "$BASE" | sed s/main/"main,contrib"/ > rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + + # Two entries echo "$BASE" > rootdir/etc/apt/sources.list echo "" >> rootdir/etc/apt/sources.list -- cgit v1.2.3 From a537ce19f955f39ee62281bb12bc71a4c67bc635 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Dec 2013 08:01:00 +0100 Subject: first version with test --- apt-pkg/sourcelist.cc | 46 +++++++++++++++++++++++++++----- test/integration/test-apt-sources-deb822 | 45 +++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 6 deletions(-) create mode 100755 test/integration/test-apt-sources-deb822 diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 0fd237cad..1261ebb52 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -242,16 +243,49 @@ bool pkgSourceList::Read(string File) /* */ bool pkgSourceList::ReadAppend(string File) { + // try reading as deb822 + // FIXME: proper error handling so that we do not error for good old-style + // sources + FileFd Fd(File, FileFd::ReadOnly); + pkgTagFile Sources(&Fd); + if (_error->PendingError() == false) + { + pkgTagSection Tags; + map Options; + int i=0; + while (Sources.Step(Tags) == true) + { + if(!Tags.Exists("Type")) + continue; + string const type = Tags.FindS("Type"); + Type *Parse = Type::GetType(type.c_str()); + if (Parse == 0) + return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,File.c_str()); + + string URI = Tags.FindS("URL"); + if (!Parse->FixupURI(URI)) + return _error->Error(_("Malformed stanza %lu in source list %s (URI parse)"),i,File.c_str()); + string const Dist = Tags.FindS("Dist"); + string const Section = Tags.FindS("Section"); + // check if there are any options we support + const char* option_str[] = { + "arch", "arch+", "arch-", "trusted" }; + for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) + if (Tags.Exists(option_str[j])) + Options[option_str[j]] = Tags.FindS(option_str[j]); + Parse->CreateItem(SrcList, URI, Dist, Section, Options); + i++; + } + // we are done + if(i>0) + return true; + } + // Open the stream for reading ifstream F(File.c_str(),ios::in /*| ios::nocreate*/); if (!F != 0) return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str()); - -#if 0 // Now Reset() does this. - for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) - delete *I; - SrcList.erase(SrcList.begin(),SrcList.end()); -#endif + // CNC:2003-12-10 - 300 is too short. char Buffer[1024]; diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 new file mode 100755 index 000000000..cdf30c02a --- /dev/null +++ b/test/integration/test-apt-sources-deb822 @@ -0,0 +1,45 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +BASE="Type: deb +URL: http://ftp.debian.org/debian +Dist: stable +Section: main +Comment: Some random string + that can be very long" + +# simple case +echo "$BASE" > rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + + +# Two entries +echo "$BASE" > rootdir/etc/apt/sources.list +echo "" >> rootdir/etc/apt/sources.list +echo "$BASE" | sed s/stable/unstable/ >> rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 +'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris + + +# ARCH option +echo "$BASE" > rootdir/etc/apt/sources.list +echo "Arch: amd64,armel" >> rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris -- cgit v1.2.3 From caeb19b796f7045f489dbce0bf681925d49136a9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Dec 2013 08:21:49 +0100 Subject: add unittest for new sourceslist parser as well --- test/libapt/makefile | 6 +++++ test/libapt/sourcelist_test.cc | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 test/libapt/sourcelist_test.cc diff --git a/test/libapt/makefile b/test/libapt/makefile index 73403b24c..a8e053d6e 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -111,3 +111,9 @@ SLIBS = -lapt-pkg SOURCE = tagfile_test.cc include $(PROGRAM_H) +# test sourcelist +PROGRAM = SourceList${BASENAME} +SLIBS = -lapt-pkg +SOURCE = sourcelist_test.cc +include $(PROGRAM_H) + diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc new file mode 100644 index 000000000..6e83d08e0 --- /dev/null +++ b/test/libapt/sourcelist_test.cc @@ -0,0 +1,52 @@ +#include +#include + +#include "assert.h" +#include +#include +#include + +char *tempfile = NULL; +int tempfile_fd = -1; + +void remove_tmpfile(void) +{ + if (tempfile_fd > 0) + close(tempfile_fd); + if (tempfile != NULL) { + unlink(tempfile); + free(tempfile); + } +} + +int main(int argc, char *argv[]) +{ + const char contents[] = "" + "Type: deb\n" + "URL: http://ftp.debian.org/debian\n" + "Dist: stable\n" + "Section: main\n" + "Comment: Some random string\n" + " that can be very long\n" + "\n" + "Type: deb\n" + "URL: http://ftp.debian.org/debian\n" + "Dist: unstable\n" + "Section: main non-free\n" + ; + + FileFd fd; + tempfile = strdup("apt-test.XXXXXXXX"); + tempfile_fd = mkstemp(tempfile); + + /* (Re-)Open (as FileFd), write and seek to start of the temp file */ + equals(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite), true); + equals(fd.Write(contents, strlen(contents)), true); + equals(fd.Seek(0), true); + + pkgSourceList sources(tempfile); + equals(sources.size(), 2); + + /* clean up handled by atexit handler, so just return here */ + return 0; +} -- cgit v1.2.3 From 300b15e3456aff88b3016a8bac90a0ba8911db8f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Dec 2013 08:36:10 +0100 Subject: fix section adding --- apt-pkg/sourcelist.cc | 11 ++++++++++- test/integration/test-apt-sources-deb822 | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 1261ebb52..4883e2fab 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -273,7 +273,16 @@ bool pkgSourceList::ReadAppend(string File) for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) if (Tags.Exists(option_str[j])) Options[option_str[j]] = Tags.FindS(option_str[j]); - Parse->CreateItem(SrcList, URI, Dist, Section, Options); + + // now create one item per section + std::vector list; + if (Section.find(",")) + list = StringSplit(Section, ","); + else + list = StringSplit(Section, " "); + for (int i=0; i < list.size(); i++) + Parse->CreateItem(SrcList, URI, Dist, list[i], Options); + i++; } // we are done diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index cdf30c02a..6e9700bb0 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -22,6 +22,16 @@ testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages. 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris +# two sections (we support both "," and " " as seperator) +echo "$BASE" | sed s/main/"main,contrib"/ > rootdir/etc/apt/sources.list + +testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + + # Two entries echo "$BASE" > rootdir/etc/apt/sources.list echo "" >> rootdir/etc/apt/sources.list -- cgit v1.2.3 From 6f4478134e13070517c00960e7eb3793d142c0ea Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Dec 2013 07:59:18 +0100 Subject: refactor deb822 reading into its own function --- apt-pkg/sourcelist.cc | 49 +++++++++++++++++++++++++++++++++---------------- apt-pkg/sourcelist.h | 5 ++++- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 4883e2fab..c28cf0127 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -238,21 +238,15 @@ bool pkgSourceList::Read(string File) return ReadAppend(File); } /*}}}*/ -// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool pkgSourceList::ReadAppend(string File) + +// FIXME: move into pkgSourceList::Type::ParseFile() +bool pkgSourceList::ParseFileDeb822(FileFd &Fd) { - // try reading as deb822 - // FIXME: proper error handling so that we do not error for good old-style - // sources - FileFd Fd(File, FileFd::ReadOnly); - pkgTagFile Sources(&Fd); - if (_error->PendingError() == false) - { pkgTagSection Tags; map Options; - int i=0; + unsigned int i=0; + + pkgTagFile Sources(&Fd); while (Sources.Step(Tags) == true) { if(!Tags.Exists("Type")) @@ -260,11 +254,11 @@ bool pkgSourceList::ReadAppend(string File) string const type = Tags.FindS("Type"); Type *Parse = Type::GetType(type.c_str()); if (Parse == 0) - return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,File.c_str()); + return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); string URI = Tags.FindS("URL"); if (!Parse->FixupURI(URI)) - return _error->Error(_("Malformed stanza %lu in source list %s (URI parse)"),i,File.c_str()); + return _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); string const Dist = Tags.FindS("Dist"); string const Section = Tags.FindS("Section"); // check if there are any options we support @@ -280,16 +274,39 @@ bool pkgSourceList::ReadAppend(string File) list = StringSplit(Section, ","); else list = StringSplit(Section, " "); - for (int i=0; i < list.size(); i++) - Parse->CreateItem(SrcList, URI, Dist, list[i], Options); + for (std::vector::const_iterator I = list.begin(); + I != list.end(); I++) + Parse->CreateItem(SrcList, URI, Dist, (*I), Options); i++; } + // we are done if(i>0) return true; + + return false; +} + + +// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadAppend(string File) +{ + // *first* try reading as deb822 + // FIXME: proper error handling so that we do not error for good old-style + // sources + FileFd Fd(File, FileFd::ReadOnly); + if (_error->PendingError() == false) + { + if (ParseFileDeb822(Fd)) + return true; } + + // *then* read as old-style sources.list + // Open the stream for reading ifstream F(File.c_str(),ios::in /*| ios::nocreate*/); if (!F != 0) diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 02e27101a..af3f4f5c6 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -75,7 +75,10 @@ class pkgSourceList protected: std::vector SrcList; - + + // FIXME: move int Type with the next ABI break + bool ParseFileDeb822(FileFd &Fd); + public: bool ReadMainList(); -- cgit v1.2.3 From 1fa78a8a3730633be662df07f7aec8f4c3dcc766 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Dec 2013 08:21:53 +0100 Subject: more refactor --- apt-pkg/sourcelist.cc | 133 +++++++++++++++++++++++++------------------------- apt-pkg/sourcelist.h | 4 +- 2 files changed, 69 insertions(+), 68 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index c28cf0127..714918bc1 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -160,7 +160,6 @@ bool pkgSourceList::Type::ParseLine(vector &List, return true; } /*}}}*/ - // SourceList::pkgSourceList - Constructors /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -182,7 +181,6 @@ pkgSourceList::~pkgSourceList() delete *I; } /*}}}*/ - /*}}}*/ // SourceList::ReadMainList - Read the main source list from etc /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -217,7 +215,6 @@ bool pkgSourceList::ReadMainList() return Res; } /*}}}*/ -// CNC:2003-03-03 - Needed to preserve backwards compatibility. // SourceList::Reset - Clear the sourcelist contents /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -228,7 +225,6 @@ void pkgSourceList::Reset() SrcList.erase(SrcList.begin(),SrcList.end()); } /*}}}*/ -// CNC:2003-03-03 - Function moved to ReadAppend() and Reset(). // SourceList::Read - Parse the sourcelist file /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -238,75 +234,21 @@ bool pkgSourceList::Read(string File) return ReadAppend(File); } /*}}}*/ - -// FIXME: move into pkgSourceList::Type::ParseFile() -bool pkgSourceList::ParseFileDeb822(FileFd &Fd) -{ - pkgTagSection Tags; - map Options; - unsigned int i=0; - - pkgTagFile Sources(&Fd); - while (Sources.Step(Tags) == true) - { - if(!Tags.Exists("Type")) - continue; - string const type = Tags.FindS("Type"); - Type *Parse = Type::GetType(type.c_str()); - if (Parse == 0) - return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); - - string URI = Tags.FindS("URL"); - if (!Parse->FixupURI(URI)) - return _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); - string const Dist = Tags.FindS("Dist"); - string const Section = Tags.FindS("Section"); - // check if there are any options we support - const char* option_str[] = { - "arch", "arch+", "arch-", "trusted" }; - for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) - if (Tags.Exists(option_str[j])) - Options[option_str[j]] = Tags.FindS(option_str[j]); - - // now create one item per section - std::vector list; - if (Section.find(",")) - list = StringSplit(Section, ","); - else - list = StringSplit(Section, " "); - for (std::vector::const_iterator I = list.begin(); - I != list.end(); I++) - Parse->CreateItem(SrcList, URI, Dist, (*I), Options); - - i++; - } - - // we are done - if(i>0) - return true; - - return false; -} - - // SourceList::ReadAppend - Parse a sourcelist file /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgSourceList::ReadAppend(string File) { - // *first* try reading as deb822 - // FIXME: proper error handling so that we do not error for good old-style - // sources - FileFd Fd(File, FileFd::ReadOnly); - if (_error->PendingError() == false) - { - if (ParseFileDeb822(Fd)) + if (ParseFileDeb822(File)) return true; - } - - - // *then* read as old-style sources.list + return ParseFileOldStyle(File); +} +// SourceList::ReadFileOldStyle - Read Traditional style sources.list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ParseFileOldStyle(string File) +{ // Open the stream for reading ifstream F(File.c_str(),ios::in /*| ios::nocreate*/); if (!F != 0) @@ -358,6 +300,65 @@ bool pkgSourceList::ReadAppend(string File) return true; } /*}}}*/ +// SourceList::ParseFileDeb822 - Parse deb822 style sources.list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ParseFileDeb822(string File) +{ + // FIXME: proper error handling so that we do not error for good old-style + // sources + FileFd Fd(File, FileFd::ReadOnly); + if (_error->PendingError() == true) + { + return false; + } + + pkgTagSection Tags; + map Options; + unsigned int i=0; + + pkgTagFile Sources(&Fd); + while (Sources.Step(Tags) == true) + { + if(!Tags.Exists("Type")) + continue; + string const type = Tags.FindS("Type"); + Type *Parse = Type::GetType(type.c_str()); + if (Parse == 0) + return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); + + string URI = Tags.FindS("URL"); + if (!Parse->FixupURI(URI)) + return _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); + string const Dist = Tags.FindS("Dist"); + string const Section = Tags.FindS("Section"); + // check if there are any options we support + const char* option_str[] = { + "arch", "arch+", "arch-", "trusted" }; + for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) + if (Tags.Exists(option_str[j])) + Options[option_str[j]] = Tags.FindS(option_str[j]); + + // now create one item per section + std::vector list; + if (Section.find(",")) + list = StringSplit(Section, ","); + else + list = StringSplit(Section, " "); + for (std::vector::const_iterator I = list.begin(); + I != list.end(); I++) + Parse->CreateItem(SrcList, URI, Dist, (*I), Options); + + i++; + } + + // we are done + if(i>0) + return true; + + return false; +} + /*}}}*/ // SourceList::FindIndex - Get the index associated with a file /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index af3f4f5c6..5e0d585bb 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -76,8 +76,8 @@ class pkgSourceList std::vector SrcList; - // FIXME: move int Type with the next ABI break - bool ParseFileDeb822(FileFd &Fd); + bool ParseFileDeb822(std::string File); + bool ParseFileOldStyle(std::string File); public: -- cgit v1.2.3 From fce9f472046344d15d4f4df281a003d837cf4177 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Dec 2013 08:30:01 +0100 Subject: add APT::Sources::Use-Deb822 to allow disabling the deb822 parser --- apt-pkg/sourcelist.cc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 714918bc1..0bbb2bd3f 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -239,7 +239,8 @@ bool pkgSourceList::Read(string File) /* */ bool pkgSourceList::ReadAppend(string File) { - if (ParseFileDeb822(File)) + if (_config->FindB("APT::Sources::Use-Deb822", true) == true) + if (ParseFileDeb822(File)) return true; return ParseFileOldStyle(File); } @@ -305,19 +306,23 @@ bool pkgSourceList::ParseFileOldStyle(string File) /* */ bool pkgSourceList::ParseFileDeb822(string File) { - // FIXME: proper error handling so that we do not error for good old-style - // sources + + pkgTagSection Tags; + map Options; + unsigned int i=0; + + // see if we can read the file + _error->PushToStack(); FileFd Fd(File, FileFd::ReadOnly); + pkgTagFile Sources(&Fd); if (_error->PendingError() == true) { + _error->RevertToStack(); return false; } - - pkgTagSection Tags; - map Options; - unsigned int i=0; + _error->MergeWithStack(); - pkgTagFile Sources(&Fd); + // read step by step while (Sources.Step(Tags) == true) { if(!Tags.Exists("Type")) -- cgit v1.2.3 From 42e19c826b9da6c21a6d286f31db51bc04c73d87 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Dec 2013 08:33:28 +0100 Subject: suppoer $(ARCH) in deb822 sources.list as well --- apt-pkg/sourcelist.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 0bbb2bd3f..99cdbe030 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -327,6 +327,7 @@ bool pkgSourceList::ParseFileDeb822(string File) { if(!Tags.Exists("Type")) continue; + string const type = Tags.FindS("Type"); Type *Parse = Type::GetType(type.c_str()); if (Parse == 0) @@ -335,8 +336,10 @@ bool pkgSourceList::ParseFileDeb822(string File) string URI = Tags.FindS("URL"); if (!Parse->FixupURI(URI)) return _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); - string const Dist = Tags.FindS("Dist"); - string const Section = Tags.FindS("Section"); + + string Dist = Tags.FindS("Dist"); + Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); + // check if there are any options we support const char* option_str[] = { "arch", "arch+", "arch-", "trusted" }; @@ -345,6 +348,7 @@ bool pkgSourceList::ParseFileDeb822(string File) Options[option_str[j]] = Tags.FindS(option_str[j]); // now create one item per section + string const Section = Tags.FindS("Section"); std::vector list; if (Section.find(",")) list = StringSplit(Section, ","); -- cgit v1.2.3 From 5e1ed0889d8aac82ca18add8c6139b153225ae71 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 1 Dec 2013 21:52:36 +0100 Subject: query an empty pkgAcqIndexDiffs if index is up-to-date The previous code already did this, this is just being a hell of a lot more obvious, so that it isn't that easy to break in the future. Git-Dch: Ignore --- apt-pkg/acquire-item.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b76921312..009531c2e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -426,16 +426,18 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ SHA1.AddFD(fd); string const local_sha1 = SHA1.Result(); - if(local_sha1 == ServerSha1) + if(local_sha1 == ServerSha1) { - // we have the same sha1 as the server + // we have the same sha1 as the server so we are done here if(Debug) std::clog << "Package file is up-to-date" << std::endl; - // set found to true, this will queue a pkgAcqIndexDiffs with - // a empty availabe_patches - found = true; - } - else + // list cleanup needs to know that this file as well as the already + // present index is ours, so we create an empty diff to save it for us + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedHash, ServerSha1, available_patches); + return true; + } + else { if(Debug) std::clog << "SHA1-Current: " << ServerSha1 << " and we start at "<< fd.Name() << " " << fd.Size() << " " << local_sha1 << std::endl; -- cgit v1.2.3 From 9d39208af5c8c72d3886c70d603921cf427056ee Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 3 Dec 2013 20:53:04 +0100 Subject: allow ':' in GetListOfFilesInDir run-parts doesn't allow this char in valid filenames, but we tend to have files with this character in e.g. /var/lib/apt/lists/ Git-Dch: Ignore --- apt-pkg/contrib/fileutl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 7fbe4d604..130e990c3 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -465,7 +465,7 @@ std::vector GetListOfFilesInDir(string const &Dir, std::vector c const char *C = Ent->d_name; for (; *C != 0; ++C) if (isalpha(*C) == 0 && isdigit(*C) == 0 - && *C != '_' && *C != '-') { + && *C != '_' && *C != '-' && *C != ':') { // no required extension -> dot is a bad character if (*C == '.' && Ext.empty() == false) continue; -- cgit v1.2.3 From 47d2bc78adb49f3182f9a3d7a4baea363e772d64 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 6 Dec 2013 12:17:48 +0100 Subject: implement POC client-side merging of pdiffs via apt-file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The idea of pdiffs is to avoid downloading the hole file by patching the existing index. This works very well, but becomes slow if a lot of patches needs to be applied to reconstruct an up-to-date index and in recent years more and more dinstall (or similar) runs are executed creating more and more pdiffs in the same amount of time, so pdiffs became less useful. The solution is simple: Reduce the amount of patches (which are very small) which need to be applied on top of the index we have available (which is usually pretty big). This can be done in two ways: Either merge the patches on the server-side so that the client has to download only one patch or the patches are all downloaded and merged on the client-side. The first needs a client who is doing one step at a time who can also skip patches if it needs (APT supports this for a long time now). The later is implemented by this commit, but depends on the server NOT merging the patches and the patches being in a strict order in which no patch is skipped. This is traditionally the case for dak, but other repository creators support merging – e.g. reprepro (which helpfully adds a flag indicating that the patches are merged). To support both or even mixes a client needs more information which isn't available for now. This POC uses the external diffindex-rred included in apt-file to do the heavy lifting of merging & applying all patches in one pass, hence to test this feature apt-file needs to be installed. --- apt-pkg/acquire-item.cc | 151 +++++++++++++++++++++++++++++++++++++- apt-pkg/acquire-item.h | 100 ++++++++++++++++++++++++- methods/rred.cc | 128 ++++++++++++++++++++++++-------- test/integration/test-pdiff-usage | 147 ++++++++++++++++++++++++++++++++----- 4 files changed, 470 insertions(+), 56 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 009531c2e..b5b9577ef 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -498,14 +498,42 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ } // we have something, queue the next diff - if(found) + if(found) { // queue the diffs string::size_type const last_space = Description.rfind(" "); if(last_space != string::npos) Description.erase(last_space, Description.size()-last_space); - new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, ServerSha1, available_patches); + + /* decide if we should download patches one by one or in one go: + The first is good if the server merges patches, but many don't so client + based merging can be attempt in which case the second is better. + "bad things" will happen if patches are merged on the server, + but client side merging is attempt as well */ + bool pdiff_merge = _config->FindB("Acquire::PDiffs::Merge", true); + if (pdiff_merge == true) + { + // this perl script is provided by apt-file + pdiff_merge = FileExists(_config->FindFile("Dir::Bin::rred", "/usr/bin/diffindex-rred")); + if (pdiff_merge == true) + { + // reprepro adds this flag if it has merged patches on the server + std::string const precedence = Tags.FindS("X-Patch-Precedence"); + pdiff_merge = (precedence != "merged"); + } + } + + if (pdiff_merge == false) + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedHash, ServerSha1, available_patches); + else + { + std::vector *diffs = new std::vector(available_patches.size()); + for(size_t i = 0; i < available_patches.size(); ++i) + (*diffs)[i] = new pkgAcqIndexMergeDiffs(Owner, RealURI, Description, Desc.ShortDesc, ExpectedHash, + available_patches[i], diffs); + } + Complete = false; Status = StatDone; Dequeue(); @@ -754,6 +782,123 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has } } /*}}}*/ +// AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor /*{{{*/ +pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner, + string const &URI, string const &URIDesc, + string const &ShortDesc, HashString const &ExpectedHash, + DiffInfo const &patch, + std::vector const * const allPatches) + : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), + patch(patch),allPatches(allPatches), State(StateFetchDiff) +{ + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(URI); + + Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); + + Description = URIDesc; + Desc.Owner = this; + Desc.ShortDesc = ShortDesc; + + Desc.URI = string(RealURI) + ".diff/" + patch.file + ".gz"; + Desc.Description = Description + " " + patch.file + string(".pdiff"); + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI + ".diff/" + patch.file); + + if(Debug) + std::clog << "pkgAcqIndexMergeDiffs: " << Desc.URI << std::endl; + + QueueURI(Desc); +} + /*}}}*/ +void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/ +{ + if(Debug) + std::clog << "pkgAcqIndexMergeDiffs failed: " << Desc.URI << " with " << Message << std::endl; + Complete = false; + Status = StatDone; + Dequeue(); + + // check if we are the first to fail, otherwise we are done here + State = StateDoneDiff; + for (std::vector::const_iterator I = allPatches->begin(); + I != allPatches->end(); ++I) + if ((*I)->State == StateErrorDiff) + return; + + // first failure means we should fallback + State = StateErrorDiff; + std::clog << "Falling back to normal index file aquire" << std::endl; + new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, + ExpectedHash); +} + /*}}}*/ +void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string Md5Hash, /*{{{*/ + pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqIndexMergeDiffs::Done(): " << Desc.URI << std::endl; + + Item::Done(Message,Size,Md5Hash,Cnf); + + string const FinalFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); + + if (State == StateFetchDiff) + { + // rred expects the patch as $FinalFile.ed.$patchname.gz + Rename(DestFile, FinalFile + ".ed." + patch.file + ".gz"); + + // check if this is the last completed diff + State = StateDoneDiff; + for (std::vector::const_iterator I = allPatches->begin(); + I != allPatches->end(); ++I) + if ((*I)->State != StateDoneDiff) + { + if(Debug) + std::clog << "Not the last done diff in the batch: " << Desc.URI << std::endl; + return; + } + + // this is the last completed diff, so we are ready to apply now + State = StateApplyDiff; + + if(Debug) + std::clog << "Sending to rred method: " << FinalFile << std::endl; + + Local = true; + Desc.URI = "rred:" + FinalFile; + QueueURI(Desc); + Mode = "rred"; + return; + } + // success in download/apply all diffs, clean up + else if (State == StateApplyDiff) + { + // see if we really got the expected file + if(!ExpectedHash.empty() && !ExpectedHash.VerifyFile(DestFile)) + { + RenameOnError(HashSumMismatch); + return; + } + + // move the result into place + if(Debug) + std::clog << "Moving patched file in place: " << std::endl + << DestFile << " -> " << FinalFile << std::endl; + Rename(DestFile, FinalFile); + chmod(FinalFile.c_str(), 0644); + + // otherwise lists cleanup will eat the file + DestFile = FinalFile; + + // all set and done + Complete = true; + if(Debug) + std::clog << "allDone: " << DestFile << "\n" << std::endl; + } +} + /*}}}*/ // AcqIndex::AcqIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The package file is added to the queue and a second class is diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 6b4f73708..5a1c7979c 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -429,7 +429,105 @@ class pkgAcqDiffIndex : public pkgAcquire::Item std::string ShortDesc, HashString ExpectedHash); }; /*}}}*/ -/** \brief An item that is responsible for fetching all the patches {{{ +/** \brief An item that is responsible for fetching client-merge patches {{{ + * that need to be applied to a given package index file. + * + * Instead of downloading and applying each patch one by one like its + * sister #pkgAcqIndexDiffs this class will download all patches at once + * and call rred with all the patches downloaded once. Rred will then + * merge and apply them in one go, which should be a lot faster – but is + * incompatible with server-based merges of patches like reprepro can do. + * + * \sa pkgAcqDiffIndex, pkgAcqIndex + */ +class pkgAcqIndexMergeDiffs : public pkgAcquire::Item +{ + protected: + + /** \brief If \b true, debugging output will be written to + * std::clog. + */ + bool Debug; + + /** \brief description of the item that is currently being + * downloaded. + */ + pkgAcquire::ItemDesc Desc; + + /** \brief URI of the package index file that is being + * reconstructed. + */ + std::string RealURI; + + /** \brief HashSum of the package index file that is being + * reconstructed. + */ + HashString ExpectedHash; + + /** \brief description of the file being downloaded. */ + std::string Description; + + /** \brief information about the current patch */ + struct DiffInfo const patch; + + /** \brief list of all download items for the patches */ + std::vector const * const allPatches; + + /** The current status of this patch. */ + enum DiffState + { + /** \brief The diff is currently being fetched. */ + StateFetchDiff, + + /** \brief The diff is currently being applied. */ + StateApplyDiff, + + /** \brief the work with this diff is done */ + StateDoneDiff, + + /** \brief something bad happened and fallback was triggered */ + StateErrorDiff + } State; + + public: + /** \brief Called when the patch file failed to be downloaded. + * + * This method will fall back to downloading the whole index file + * outright; its arguments are ignored. + */ + virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); + + virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash, + pkgAcquire::MethodConfig *Cnf); + virtual std::string DescURI() {return RealURI + "Index";}; + + /** \brief Create an index merge-diff item. + * + * \param Owner The pkgAcquire object that owns this item. + * + * \param URI The URI of the package index file being + * reconstructed. + * + * \param URIDesc A long description of this item. + * + * \param ShortDesc A brief description of this item. + * + * \param ExpectedHash The expected md5sum of the completely + * reconstructed package index file; the index file will be tested + * against this value when it is entirely reconstructed. + * + * \param patch contains infos about the patch this item is supposed + * to download which were read from the index + * + * \param allPatches contains all related items so that each item can + * check if it was the last one to complete the download step + */ + pkgAcqIndexMergeDiffs(pkgAcquire *Owner,std::string const &URI,std::string const &URIDesc, + std::string const &ShortDesc, HashString const &ExpectedHash, + DiffInfo const &patch, std::vector const * const allPatches); +}; + /*}}}*/ +/** \brief An item that is responsible for fetching server-merge patches {{{ * that need to be applied to a given package index file. * * After downloading and applying a single patch, this item will diff --git a/methods/rred.cc b/methods/rred.cc index 7c65f8f92..bea8ed263 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -11,6 +11,8 @@ #include #include +#include +#include #include #include #include @@ -465,50 +467,112 @@ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ } else URIStart(Res); - if (Debug == true) - std::clog << "Patching " << Path << " with " << Path - << ".ed and putting result into " << Itm->DestFile << std::endl; - // Open the source and destination files (the d'tor of FileFd will do - // the cleanup/closing of the fds) - FileFd From(Path,FileFd::ReadOnly); - FileFd Patch(Path+".ed",FileFd::ReadOnly, FileFd::Gzip); - FileFd To(Itm->DestFile,FileFd::WriteAtomic); - To.EraseOnFailure(); - if (_error->PendingError() == true) - return false; - + std::string lastPatchName; Hashes Hash; - // now do the actual patching - State const result = patchMMap(Patch, From, To, &Hash); - if (result == MMAP_FAILED) { - // retry with patchFile - Patch.Seek(0); - From.Seek(0); - To.Open(Itm->DestFile,FileFd::WriteAtomic); + + // check for a single ed file + if (FileExists(Path+".ed") == true) + { + if (Debug == true) + std::clog << "Patching " << Path << " with " << Path + << ".ed and putting result into " << Itm->DestFile << std::endl; + + // Open the source and destination files + lastPatchName = Path + ".ed"; + FileFd From(Path,FileFd::ReadOnly); + FileFd To(Itm->DestFile,FileFd::WriteAtomic); + To.EraseOnFailure(); + FileFd Patch(lastPatchName, FileFd::ReadOnly, FileFd::Gzip); if (_error->PendingError() == true) - return false; - if (patchFile(Patch, From, To, &Hash) != ED_OK) { - return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str()); + return false; + + // now do the actual patching + State const result = patchMMap(Patch, From, To, &Hash); + if (result == MMAP_FAILED) { + // retry with patchFile + Patch.Seek(0); + From.Seek(0); + To.Open(Itm->DestFile,FileFd::WriteAtomic); + if (_error->PendingError() == true) + return false; + if (patchFile(Patch, From, To, &Hash) != ED_OK) { + return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str()); + } else if (Debug == true) { + std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl; + } + } else if (result != ED_OK) { + return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str()); } else if (Debug == true) { - std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl; + std::clog << "rred: finished mmap patching of " << Path << std::endl; } - } else if (result != ED_OK) { - return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str()); - } else if (Debug == true) { - std::clog << "rred: finished mmap patching of " << Path << std::endl; + + // write out the result + From.Close(); + Patch.Close(); + To.Close(); } + else + { + if (Debug == true) + std::clog << "Patching " << Path << " with all " << Path << ".ed.*.gz files and " + << "putting result into " << Itm->DestFile << std::endl; + + int From = open(Path.c_str(), O_RDONLY); + unlink(Itm->DestFile.c_str()); + int To = open(Itm->DestFile.c_str(), O_WRONLY | O_CREAT | O_EXCL, 0644); + SetCloseExec(From, false); + SetCloseExec(To, false); + + _error->PushToStack(); + std::vector patches = GetListOfFilesInDir(flNotFile(Path), "gz", true, false); + _error->RevertToStack(); + + std::string externalrred = _config->Find("Dir::Bin::rred", "/usr/bin/diffindex-rred"); + std::vector Args; + Args.reserve(22); + Args.push_back(externalrred.c_str()); + + std::string const baseName = Path + ".ed."; + for (std::vector::const_iterator p = patches.begin(); + p != patches.end(); ++p) + if (p->compare(0, baseName.length(), baseName) == 0) + Args.push_back(p->c_str()); + + Args.push_back(NULL); + + pid_t Patcher = ExecFork(); + if (Patcher == 0) { + dup2(From, STDIN_FILENO); + dup2(To, STDOUT_FILENO); + + execvp(Args[0], (char **) &Args[0]); + std::cerr << "Failed to execute patcher " << Args[0] << "!" << std::endl; + _exit(100); + } + // last is NULL, so the one before is the last patch + lastPatchName = Args[Args.size() - 2]; - // write out the result - From.Close(); - Patch.Close(); - To.Close(); + if (ExecWait(Patcher, "rred") == false) + return _error->Errno("rred", "Patching via external rred failed"); + + close(From); + close(To); + + struct stat Buf; + if (stat(Itm->DestFile.c_str(), &Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + To = open(Path.c_str(), O_RDONLY); + Hash.AddFD(To, Buf.st_size); + close(To); + } /* Transfer the modification times from the patch file to be able to see in which state the file should be and use the access time from the "old" file */ struct stat BufBase, BufPatch; if (stat(Path.c_str(),&BufBase) != 0 || - stat(std::string(Path+".ed").c_str(),&BufPatch) != 0) + stat(lastPatchName.c_str(), &BufPatch) != 0) return _error->Errno("stat",_("Failed to stat")); struct utimbuf TimeBuf; diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index ac0563b7f..5a06e0ccb 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -5,39 +5,146 @@ TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture "i386" +configarchitecture 'i386' buildaptarchive setupflataptarchive changetowebserver -signreleasefiles -testsuccess aptget update -testnopackage newstuff PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')" -testequal "$(cat ${PKGFILE}) + +echo '#!/bin/sh +touch merge-was-used +/usr/bin/diffindex-rred "$@"' > extrred +chmod +x extrred +echo 'Dir::Bin::rred "./extrred";' > rootdir/etc/apt/apt.conf.d/99rred + +wasmergeused() { + testsuccess aptget update "$@" + msgtest 'Check if the right pdiff merger was used' + if [ -e ./merge-was-used ]; then + rm -f ./merge-was-used + if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then + msgpass + else + msgfail "Merge shouldn't have been used, but was" + fi + elif echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then + msgfail "Merge should have been used, but wasn't" + else + msgpass + fi +} + +testrun() { + # setup the base + find aptarchive -name 'Packages*' -type f -delete + cp ${PKGFILE} aptarchive/Packages + compressfile 'aptarchive/Packages' + generatereleasefiles + signreleasefiles + rm -rf aptarchive/Packages.diff rootdir/var/lib/apt/lists + testsuccess aptget update "$@" + cp -a rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists-bak + testnopackage newstuff + testequal "$(cat ${PKGFILE}) " aptcache show apt oldstuff -cp ${PKGFILE}-new aptarchive/Packages -compressfile 'aptarchive/Packages' -rm -rf aptarchive/Packages.diff -mkdir -p aptarchive/Packages.diff -PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)" -diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true -cat $PATCHFILE | gzip > ${PATCHFILE}.gz -PATCHINDEX="aptarchive/Packages.diff/Index" -echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new) + # apply with one patch + cp ${PKGFILE}-new aptarchive/Packages + compressfile 'aptarchive/Packages' + mkdir -p aptarchive/Packages.diff + PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)" + diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true + cat $PATCHFILE | gzip > ${PATCHFILE}.gz + PATCHINDEX='aptarchive/Packages.diff/Index' + echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new) SHA1-History: 9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28 $(sha1sum $PKGFILE | cut -d' ' -f 1) $(stat -c%s $PKGFILE) $(basename $PATCHFILE) SHA1-Patches: 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28 $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX -generatereleasefiles '+1hour' -signreleasefiles -find aptarchive -name 'Packages*' -type f -delete -testsuccess aptget update + generatereleasefiles '+1hour' + signreleasefiles + find aptarchive -name 'Packages*' -type f -delete + wasmergeused "$@" + testnopackage oldstuff + testequal "$(cat ${PKGFILE}-new) +" aptcache show apt newstuff -testnopackage oldstuff -testequal "$(cat ${PKGFILE}-new) + # index is already up-to-date + find rootdir/var/lib/apt/lists -name '*.IndexDiff' -type f -delete + testsuccess aptget update "$@" + testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff + + # apply with two patches + cp ${PKGFILE}-new aptarchive/Packages + echo ' +Package: futurestuff +Version: 1.0 +Architecture: i386 +Maintainer: Joe Sixpack +Installed-Size: 202 +Filename: pool/futurestuff_1.0_i386.deb +Size: 202200 +MD5sum: 311aeeaaae5ba33aff1ceaf3e1f76671 +SHA1: 3c695e028f7a1ae324deeaae5ba332desa81088c +SHA256: b46fd154615edaae5ba33c56a5cc0e7deaef23e2da3e4f129727fd660f28f050 +Description: some cool and shiny future stuff + This package will appear in the next next mirror update +Description-md5: d5f89fbbc2ce34c455dfee9b67d82b6b' >> aptarchive/Packages + + compressfile 'aptarchive/Packages' + PATCHFILE2="aptarchive/Packages.diff/$(date -d 'now + 1hour' '+%Y-%m-%d-%H%M.%S')" + diff -e ${PKGFILE}-new aptarchive/Packages > ${PATCHFILE2} || true + cat $PATCHFILE2 | gzip > ${PATCHFILE2}.gz + echo "SHA1-Current: $(sha1sum aptarchive/Packages | cut -d' ' -f 1) $(stat -c%s aptarchive/Packages) +SHA1-History: + 9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28 + $(sha1sum ${PKGFILE} | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}) $(basename ${PATCHFILE}) + $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new) $(basename ${PATCHFILE2}) +SHA1-Patches: + 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28 + $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE) + $(sha1sum ${PATCHFILE2} | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE2}) $(basename ${PATCHFILE2})" > $PATCHINDEX + generatereleasefiles '+2hour' + signreleasefiles + cp -a aptarchive/Packages Packages-future + find aptarchive -name 'Packages*' -type f -delete + rm -rf rootdir/var/lib/apt/lists + cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists + wasmergeused "$@" + testnopackage oldstuff + testequal "$(cat Packages-future) +" aptcache show apt newstuff futurestuff + + # patch applying fails, but successful fallback + rm -rf rootdir/var/lib/apt/lists + cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists + cp ${PKGFILE}-new aptarchive/Packages + compressfile 'aptarchive/Packages' + mkdir -p aptarchive/Packages.diff + PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)" + diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true + PATCHINDEX='aptarchive/Packages.diff/Index' + echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new) +SHA1-History: + 9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28 + $(sha1sum $PKGFILE | cut -d' ' -f 1) $(stat -c%s $PKGFILE) $(basename $PATCHFILE) +SHA1-Patches: + 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28 + $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX + echo 'I am Mallory and I change files' >> $PATCHFILE + cat $PATCHFILE | gzip > ${PATCHFILE}.gz + generatereleasefiles '+1hour' + signreleasefiles + testsuccess aptget update "$@" + testnopackage oldstuff + testequal "$(cat ${PKGFILE}-new) +" aptcache show apt newstuff +} + +testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=0 +testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=1 -- cgit v1.2.3 From d2d68aaf5bc2211e9c488f2603ccb4e5fd591a6d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 4 Jan 2014 15:39:04 +0100 Subject: improve tests --- apt-pkg/sourcelist.cc | 3 ++- test/integration/framework | 13 +++++++++++-- test/integration/test-apt-sources-deb822 | 21 ++++++++++++++++----- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 99cdbe030..35e13b6f5 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -342,7 +342,8 @@ bool pkgSourceList::ParseFileDeb822(string File) // check if there are any options we support const char* option_str[] = { - "arch", "arch+", "arch-", "trusted" }; + "arch", "arch+", "arch-", "trusted", + }; for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) if (Tags.Exists(option_str[j])) Options[option_str[j]] = Tags.FindS(option_str[j]); diff --git a/test/integration/framework b/test/integration/framework index a28363768..6ada1e9cc 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -948,13 +948,22 @@ testempty() { test -z "$($* 2>&1)" && msgpass || msgfail } -testequal() { +testequalwithmsg() { + local MSG="$1" + shift local COMPAREFILE=$(mktemp) addtrap "rm $COMPAREFILE;" echo "$1" > $COMPAREFILE shift - msgtest "Test for equality of" "$*" + msgtest "$MSG" $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail +} + +testequal() { + local EXPECTED="$1" + shift + local MSG="Test for equality of $*" + testequalwithmsg "$MSG" "$EXPECTED" $* } testequalor2() { diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 6e9700bb0..24fb1bdb0 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -7,7 +7,17 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" -BASE="Type: deb +echo "deb http://ftp.debian.org/debian stable main" > rootdir/etc/apt/sources.list +testequalwithmsg "Old style sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + + +BASE="# some comment +# that contains a : as well +#Type: meep + +Type: deb URL: http://ftp.debian.org/debian Dist: stable Section: main @@ -17,7 +27,7 @@ Comment: Some random string # simple case echo "$BASE" > rootdir/etc/apt/sources.list -testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris @@ -25,7 +35,7 @@ testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages. # two sections (we support both "," and " " as seperator) echo "$BASE" | sed s/main/"main,contrib"/ > rootdir/etc/apt/sources.list -testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +testequalwithmsg "Two sections deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : @@ -37,7 +47,7 @@ echo "$BASE" > rootdir/etc/apt/sources.list echo "" >> rootdir/etc/apt/sources.list echo "$BASE" | sed s/stable/unstable/ >> rootdir/etc/apt/sources.list -testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +testequalwithmsg "Multiple entries in deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 : @@ -49,7 +59,8 @@ testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages. echo "$BASE" > rootdir/etc/apt/sources.list echo "Arch: amd64,armel" >> rootdir/etc/apt/sources.list -testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : +testequalwithmsg "Arch: option in deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + -- cgit v1.2.3 From 4194c9aee2766845618ef0431fd4803b0467aab7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 4 Jan 2014 16:23:32 +0100 Subject: improve error message --- apt-pkg/sourcelist.cc | 34 +++++++++++++++++++++----------- apt-pkg/sourcelist.h | 2 +- test/integration/test-apt-sources-deb822 | 30 ++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 21 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 35e13b6f5..5e4a58e95 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -240,8 +240,14 @@ bool pkgSourceList::Read(string File) bool pkgSourceList::ReadAppend(string File) { if (_config->FindB("APT::Sources::Use-Deb822", true) == true) - if (ParseFileDeb822(File)) + { + int lines_parsed =ParseFileDeb822(File); + if (lines_parsed < 0) + return false; + else if (lines_parsed > 0) return true; + // no lines parsed ... fall through and use old style parser + } return ParseFileOldStyle(File); } @@ -303,10 +309,9 @@ bool pkgSourceList::ParseFileOldStyle(string File) /*}}}*/ // SourceList::ParseFileDeb822 - Parse deb822 style sources.list /*{{{*/ // --------------------------------------------------------------------- -/* */ -bool pkgSourceList::ParseFileDeb822(string File) +/* Returns: the number of stanzas parsed*/ +int pkgSourceList::ParseFileDeb822(string File) { - pkgTagSection Tags; map Options; unsigned int i=0; @@ -318,7 +323,7 @@ bool pkgSourceList::ParseFileDeb822(string File) if (_error->PendingError() == true) { _error->RevertToStack(); - return false; + return 0; } _error->MergeWithStack(); @@ -331,11 +336,19 @@ bool pkgSourceList::ParseFileDeb822(string File) string const type = Tags.FindS("Type"); Type *Parse = Type::GetType(type.c_str()); if (Parse == 0) - return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); + { + _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); + // true means we do not retry with old-style sources.list + return -1; + } string URI = Tags.FindS("URL"); if (!Parse->FixupURI(URI)) - return _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); + { + _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); + // means we do not retry with old-style sources.list + return -1; + } string Dist = Tags.FindS("Dist"); Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); @@ -362,11 +375,8 @@ bool pkgSourceList::ParseFileDeb822(string File) i++; } - // we are done - if(i>0) - return true; - - return false; + // we are done, return the number of stanzas read + return i; } /*}}}*/ // SourceList::FindIndex - Get the index associated with a file /*{{{*/ diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 5e0d585bb..d83c76d6a 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -76,7 +76,7 @@ class pkgSourceList std::vector SrcList; - bool ParseFileDeb822(std::string File); + int ParseFileDeb822(std::string File); bool ParseFileOldStyle(std::string File); public: diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 24fb1bdb0..bacad1ed4 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -7,7 +7,9 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" -echo "deb http://ftp.debian.org/debian stable main" > rootdir/etc/apt/sources.list +SOURCES="rootdir/etc/apt/sources.list" + +echo "deb http://ftp.debian.org/debian stable main" > $SOURCES testequalwithmsg "Old style sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris @@ -25,7 +27,7 @@ Comment: Some random string that can be very long" # simple case -echo "$BASE" > rootdir/etc/apt/sources.list +echo "$BASE" > $SOURCES testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : @@ -33,7 +35,7 @@ testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debi # two sections (we support both "," and " " as seperator) -echo "$BASE" | sed s/main/"main,contrib"/ > rootdir/etc/apt/sources.list +echo "$BASE" | sed s/main/"main,contrib"/ > $SOURCES testequalwithmsg "Two sections deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 : @@ -43,9 +45,9 @@ testequalwithmsg "Two sections deb822 sources.list work" "'http://ftp.debian.org # Two entries -echo "$BASE" > rootdir/etc/apt/sources.list -echo "" >> rootdir/etc/apt/sources.list -echo "$BASE" | sed s/stable/unstable/ >> rootdir/etc/apt/sources.list +echo "$BASE" > $SOURCES +echo "" >> $SOURCES +echo "$BASE" | sed s/stable/unstable/ >> $SOURCES testequalwithmsg "Multiple entries in deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : @@ -56,11 +58,23 @@ testequalwithmsg "Multiple entries in deb822 sources.list work" "'http://ftp.deb # ARCH option -echo "$BASE" > rootdir/etc/apt/sources.list -echo "Arch: amd64,armel" >> rootdir/etc/apt/sources.list +echo "$BASE" > $SOURCES +echo "Arch: amd64,armel" >> $SOURCES testequalwithmsg "Arch: option in deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris +# invalid sources.list file +echo "deb http://ftp.debian.org" > $SOURCES + +testequalwithmsg "Invalid sources.list file gives proper error" "E: Malformed line 1 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (dist) +E: The list of sources could not be read." aptget update --print-uris + +echo "Type: deb +Dist: stable +" > $SOURCES + +testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse) +E: The list of sources could not be read." aptget update --print-uris -- cgit v1.2.3 From 652d50517e79f044c6c8959d4768c46a82a773da Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 5 Jan 2014 10:08:42 +0100 Subject: prepare 0.9.14.3~exp1 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index fb8c5714f..22f65fb75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +apt (0.9.14.3~exp1) experimental; urgency=low + + [ Michael Vogt ] + * add APT::Sources::Use-Deb822 to allow disabling the deb822 parser + + [ David Kalnischkies ] + * implement POC client-side merging of pdiffs via apt-file + + [ Trần Ngọc Quân ] + * l10n: vi.po(617t): Update Vietnamese translation + + -- Michael Vogt Sun, 05 Jan 2014 10:07:51 +0100 + apt (0.9.14.2) unstable; urgency=low [ Joe Hansen ] -- cgit v1.2.3 From c09548fde7a8a5efd793784d02bb933c2eef3c4d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 5 Jan 2014 10:08:42 +0100 Subject: prepare 0.9.14.3~exp1 --- configure.ac | 2 +- debian/changelog | 5 ++-- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 2 +- po/ar.po | 74 +++++++++++++++++++++++++++++---------------------- po/ast.po | 74 +++++++++++++++++++++++++++++---------------------- po/bg.po | 74 +++++++++++++++++++++++++++++---------------------- po/bs.po | 74 +++++++++++++++++++++++++++++---------------------- po/ca.po | 74 +++++++++++++++++++++++++++++---------------------- po/cs.po | 74 +++++++++++++++++++++++++++++---------------------- po/cy.po | 74 +++++++++++++++++++++++++++++---------------------- po/da.po | 74 +++++++++++++++++++++++++++++---------------------- po/de.po | 74 +++++++++++++++++++++++++++++---------------------- po/dz.po | 74 +++++++++++++++++++++++++++++---------------------- po/el.po | 74 +++++++++++++++++++++++++++++---------------------- po/es.po | 74 +++++++++++++++++++++++++++++---------------------- po/eu.po | 74 +++++++++++++++++++++++++++++---------------------- po/fi.po | 74 +++++++++++++++++++++++++++++---------------------- po/fr.po | 75 ++++++++++++++++++++++++++++++---------------------- po/gl.po | 74 +++++++++++++++++++++++++++++---------------------- po/hu.po | 74 +++++++++++++++++++++++++++++---------------------- po/it.po | 74 +++++++++++++++++++++++++++++---------------------- po/ja.po | 74 +++++++++++++++++++++++++++++---------------------- po/km.po | 74 +++++++++++++++++++++++++++++---------------------- po/ko.po | 74 +++++++++++++++++++++++++++++---------------------- po/ku.po | 74 +++++++++++++++++++++++++++++---------------------- po/lt.po | 74 +++++++++++++++++++++++++++++---------------------- po/mr.po | 74 +++++++++++++++++++++++++++++---------------------- po/nb.po | 74 +++++++++++++++++++++++++++++---------------------- po/ne.po | 74 +++++++++++++++++++++++++++++---------------------- po/nl.po | 74 +++++++++++++++++++++++++++++---------------------- po/nn.po | 74 +++++++++++++++++++++++++++++---------------------- po/pl.po | 74 +++++++++++++++++++++++++++++---------------------- po/pt.po | 74 +++++++++++++++++++++++++++++---------------------- po/pt_BR.po | 74 +++++++++++++++++++++++++++++---------------------- po/ro.po | 74 +++++++++++++++++++++++++++++---------------------- po/ru.po | 74 +++++++++++++++++++++++++++++---------------------- po/sk.po | 74 +++++++++++++++++++++++++++++---------------------- po/sl.po | 74 +++++++++++++++++++++++++++++---------------------- po/sv.po | 74 +++++++++++++++++++++++++++++---------------------- po/th.po | 74 +++++++++++++++++++++++++++++---------------------- po/tl.po | 74 +++++++++++++++++++++++++++++---------------------- po/tr.po | 75 ++++++++++++++++++++++++++++++---------------------- po/uk.po | 74 +++++++++++++++++++++++++++++---------------------- po/vi.po | 74 +++++++++++++++++++++++++++++---------------------- po/zh_CN.po | 74 +++++++++++++++++++++++++++++---------------------- po/zh_TW.po | 74 +++++++++++++++++++++++++++++---------------------- 47 files changed, 1814 insertions(+), 1381 deletions(-) diff --git a/configure.ac b/configure.ac index 42c5d73df..eefb454d7 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.14.2" +PACKAGE_VERSION="0.9.14.3~exp1" 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 22f65fb75..e1b545949 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ apt (0.9.14.3~exp1) experimental; urgency=low [ Michael Vogt ] - * add APT::Sources::Use-Deb822 to allow disabling the deb822 parser + * add support for "deb822" style sources.list format and add + APT::Sources::Use-Deb822 to support disabling it [ David Kalnischkies ] * implement POC client-side merging of pdiffs via apt-file @@ -9,7 +10,7 @@ apt (0.9.14.3~exp1) experimental; urgency=low [ Trần Ngọc Quân ] * l10n: vi.po(617t): Update Vietnamese translation - -- Michael Vogt Sun, 05 Jan 2014 10:07:51 +0100 + -- Michael Vogt Sun, 05 Jan 2014 15:13:32 +0100 apt (0.9.14.2) unstable; urgency=low diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 9a061e61d..8d6131d58 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 554206e01..9c612e994 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.14.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ar.po b/po/ar.po index 081e8de47..2eac4a7c9 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -635,11 +635,11 @@ msgid "File not found" msgstr "لم يُعثر على الملف" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -714,7 +714,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1477,8 +1477,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1516,14 +1516,14 @@ msgstr "فشل إغلاق الملف %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2506,76 +2506,86 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" +#: apt-pkg/sourcelist.cc:340 +#, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "" + +#: apt-pkg/sourcelist.cc:348 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2787,35 +2797,35 @@ msgstr "الحجم غير متطابق" msgid "Invalid file format" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2823,24 +2833,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ast.po b/po/ast.po index 723546842..8492dc7ce 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -741,11 +741,11 @@ msgid "File not found" msgstr "Nun s'atopa'l ficheru." #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -820,7 +820,7 @@ msgstr "Una rempuesta revirtió'l buffer." msgid "Protocol corruption" msgstr "Corrupción del protocolu" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1604,8 +1604,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1643,7 +1643,7 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1652,7 +1652,7 @@ msgstr "" "Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el " "parche parez corruptu." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2720,79 +2720,89 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinia %u enforma llarga na llista d'oríxenes %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3014,35 +3024,35 @@ msgstr "El tamañu nun concasa" msgid "Invalid file format" msgstr "Operación incorreuta: %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3052,12 +3062,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3066,12 +3076,12 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/bg.po b/po/bg.po index bb93a3e72..a8e7a975f 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -767,11 +767,11 @@ msgid "File not found" msgstr "Файлът не е намерен" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -846,7 +846,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1638,8 +1638,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1677,7 +1677,7 @@ msgstr "Грешка при четене файла „%s“ от огледал msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1686,7 +1686,7 @@ msgstr "" "Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда " "повредена." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2758,83 +2758,93 @@ msgstr "Неуспех при анализирането на пакетен ф msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма " "стойност)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3066,7 +3076,7 @@ msgstr "Несъответствие на размера" msgid "Invalid file format" msgstr "Невалидна операция %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3075,16 +3085,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3093,12 +3103,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3108,12 +3118,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3122,12 +3132,12 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/bs.po b/po/bs.po index 1f3a0a13a..56edfca9a 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -641,11 +641,11 @@ msgid "File not found" msgstr "Datoteka nije pronađena" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "" @@ -719,7 +719,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1472,8 +1472,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1511,14 +1511,14 @@ msgstr "Ne mogu otvoriti %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2501,76 +2501,86 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" +#: apt-pkg/sourcelist.cc:340 +#, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "" + +#: apt-pkg/sourcelist.cc:348 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2780,35 +2790,35 @@ msgstr "" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2816,24 +2826,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ca.po b/po/ca.po index be559ae68..f9b274516 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -752,11 +752,11 @@ msgid "File not found" msgstr "Fitxer no trobat" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -831,7 +831,7 @@ msgstr "Una resposta ha desbordat la memòria intermèdia." msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1626,8 +1626,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1665,7 +1665,7 @@ msgstr "No es pot llegir el fitxer rèplica «%s»" msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1674,7 +1674,7 @@ msgstr "" "No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació " "del fitxer - el pedaç sembla ser incorrecte" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2743,79 +2743,89 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3048,7 +3058,7 @@ msgstr "La mida no concorda" msgid "Invalid file format" msgstr "Operació no vàlida %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3057,16 +3067,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3075,12 +3085,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3091,12 +3101,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3106,12 +3116,12 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/cs.po b/po/cs.po index c4f634ac0..a94899a6c 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -749,11 +749,11 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -828,7 +828,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1614,8 +1614,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1653,7 +1653,7 @@ msgstr "Nelze číst soubor se zrcadly „%s“" msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1662,7 +1662,7 @@ msgstr "" "Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je " "záplata porušená." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2717,76 +2717,86 @@ msgstr "Nelze zpracovat soubor %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3007,7 +3017,7 @@ msgstr "Velikosti nesouhlasí" msgid "Invalid file format" msgstr "Neplatná operace %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3016,16 +3026,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3034,12 +3044,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3049,12 +3059,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3063,12 +3073,12 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento " "balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/cy.po b/po/cy.po index d2456f053..c65e9850e 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -759,11 +759,11 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -839,7 +839,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1630,8 +1630,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1669,14 +1669,14 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2760,81 +2760,91 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3066,7 +3076,7 @@ msgstr "Camgyfatebiaeth maint" msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3074,28 +3084,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3103,13 +3113,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3118,12 +3128,12 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/da.po b/po/da.po index fad5ec57f..1ef8a5b1f 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2013-12-14 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -776,11 +776,11 @@ msgid "File not found" msgstr "Fil blev ikke fundet" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -855,7 +855,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1639,8 +1639,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1678,7 +1678,7 @@ msgstr "Ingen post fundet i spejlfil »%s«" msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1687,7 +1687,7 @@ msgstr "" "Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - " "fejlrettelsen ser ud til at være ødelagt." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2749,76 +2749,86 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Åbner %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3042,7 +3052,7 @@ msgstr "Størrelsen stemmer ikke" msgid "Invalid file format" msgstr "Ugyldigt filformat" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3051,17 +3061,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3070,12 +3080,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3085,12 +3095,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3099,12 +3109,12 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/de.po b/po/de.po index 858ef4faa..c411905f1 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -787,11 +787,11 @@ msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -866,7 +866,7 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1671,8 +1671,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1710,7 +1710,7 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1719,7 +1719,7 @@ msgstr "" "Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf %s " "angewendet werden - der Patch scheint beschädigt zu sein." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2803,77 +2803,87 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet." -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3114,7 +3124,7 @@ msgstr "Größe stimmt nicht überein" msgid "Invalid file format" msgstr "Ungültige Operation %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3123,17 +3133,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3142,12 +3152,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3158,12 +3168,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3173,14 +3183,14 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/dz.po b/po/dz.po index f32a8809e..55d894505 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -734,11 +734,11 @@ msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -813,7 +813,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1591,8 +1591,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1630,14 +1630,14 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2704,76 +2704,86 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2995,35 +3005,35 @@ msgstr "ཚད་མ་མཐུན།" msgid "Invalid file format" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3031,12 +3041,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3045,12 +3055,12 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/el.po b/po/el.po index 7d2685f38..49e368859 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -745,11 +745,11 @@ msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -824,7 +824,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1611,8 +1611,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1650,14 +1650,14 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2727,76 +2727,86 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3024,35 +3034,35 @@ msgstr "Ανόμοιο μέγεθος" msgid "Invalid file format" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3060,12 +3070,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3074,12 +3084,12 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/es.po b/po/es.po index 98cae4093..c1700c16b 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -805,11 +805,11 @@ msgid "File not found" msgstr "Fichero no encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -884,7 +884,7 @@ msgstr "No pude crear un socket." msgid "Protocol corruption" msgstr "Fallo del protocolo" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1677,8 +1677,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1716,7 +1716,7 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "[Mirror: %s]" msgstr "[Réplica: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1725,7 +1725,7 @@ msgstr "" "No se pudo parchear %s con mmap y con el modo de uso de la operación de " "ficheros - el paquete parece dañado." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2803,82 +2803,92 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene " "asociado un valor)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3109,37 +3119,37 @@ msgstr "El tamaño difiere" msgid "Invalid file format" msgstr "Operación inválida: %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3150,12 +3160,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3165,12 +3175,12 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/eu.po b/po/eu.po index 743367e45..00c752628 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -733,11 +733,11 @@ msgid "File not found" msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -814,7 +814,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1599,8 +1599,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1638,14 +1638,14 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2706,76 +2706,86 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2993,35 +3003,35 @@ msgstr "Tamaina ez dator bat" msgid "Invalid file format" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3029,12 +3039,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3043,12 +3053,12 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/fi.po b/po/fi.po index 5fceb73ef..087a5de48 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -727,11 +727,11 @@ msgid "File not found" msgstr "Tiedostoa ei löydy" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -806,7 +806,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1591,8 +1591,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1630,14 +1630,14 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2697,76 +2697,86 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2984,35 +2994,35 @@ msgstr "Koko ei täsmää" msgid "Invalid file format" msgstr "Virheellinen toiminto %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3020,12 +3030,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3034,12 +3044,12 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/fr.po b/po/fr.po index 2c7f2114d..2a3614a30 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2013-08-17 07:57+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -790,11 +790,11 @@ msgid "File not found" msgstr "Fichier non trouvé" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -870,7 +870,7 @@ msgstr "Une réponse a fait déborder le tampon." msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1680,8 +1680,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1719,7 +1719,7 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." msgid "[Mirror: %s]" msgstr "[Miroir : %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1728,7 +1728,7 @@ msgstr "" "Impossible de modifier %s avec mmap et l'utilisation des opérations de " "fichiers : le correctif semble être corrompu." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2810,87 +2810,98 @@ msgstr "Impossible de traiter le fichier %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser " "[option])" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une " "affectation)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de " "valeur)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "" +"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3134,7 +3145,7 @@ msgstr "Taille incohérente" msgid "Invalid file format" msgstr "L'opération %s n'est pas valable" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3143,18 +3154,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3163,12 +3174,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3179,12 +3190,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3193,14 +3204,14 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/gl.po b/po/gl.po index 594340651..6c99e1d1e 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -750,11 +750,11 @@ msgid "File not found" msgstr "Non se atopou o ficheiro" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -829,7 +829,7 @@ msgstr "Unha resposta desbordou o búfer." msgid "Protocol corruption" msgstr "Dano no protocolo" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1628,8 +1628,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1667,7 +1667,7 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»" msgid "[Mirror: %s]" msgstr "[Replica: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1676,7 +1676,7 @@ msgstr "" "Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - a " "actualización semella estar danada." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2750,80 +2750,90 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal construída na lista de orixes %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de orixes %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal construída na lista de orixes %s (tipo)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3050,7 +3060,7 @@ msgstr "Os tamaños non coinciden" msgid "Invalid file format" msgstr "Operación incorrecta: %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3059,29 +3069,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3092,12 +3102,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3106,12 +3116,12 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/hu.po b/po/hu.po index d91bd407e..014f95ad1 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -766,11 +766,11 @@ msgid "File not found" msgstr "A fájl nem található" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -847,7 +847,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokollhiba" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1632,8 +1632,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1671,7 +1671,7 @@ msgstr "A(z) „%s” tükörfájl nem olvasható" msgid "[Mirror: %s]" msgstr "[Tükör: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1680,7 +1680,7 @@ msgstr "" "%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek " "tűnik." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2750,86 +2750,96 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] " "feldolgozhatatlan)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl " "rövid)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "érvényes hozzárendelés)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "tartalmaz kulcsot)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak " "nincs értéke)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3057,7 +3067,7 @@ msgstr "A méret nem megfelelő" msgid "Invalid file format" msgstr "%s érvénytelen művelet" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3066,16 +3076,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3084,12 +3094,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3099,12 +3109,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3113,12 +3123,12 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/it.po b/po/it.po index d7f8a8a24..f01aea6ba 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2013-08-27 22:06+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -779,11 +779,11 @@ msgid "File not found" msgstr "File non trovato" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -859,7 +859,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1662,8 +1662,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1701,7 +1701,7 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\"" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1710,7 +1710,7 @@ msgstr "" "Impossibile applicare la patch a %s con mmap e con l'utilizzo di operazioni " "file. La patch sembra essere danneggiata." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2792,86 +2792,96 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file di pacchetto %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non " "analizzabile)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo " "corta)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è " "un'assegnazione)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una " "chiave)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non " "ha un valore)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La riga %lu nel file %s non è corretta (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La riga %lu nel file %s non è corretta (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La riga %lu nel file %s non è corretta (absolute dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La riga %lu nel file %s non è corretta (dist parse)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Apertura di %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riga %u troppo lunga nel file %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La riga %u nel file %s non è corretta (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "La riga %lu nel file %s non è corretta (URI parse)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3107,7 +3117,7 @@ msgstr "Le dimensioni non corrispondono" msgid "Invalid file format" msgstr "Operazione %s non valida" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3116,17 +3126,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3135,12 +3145,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3150,12 +3160,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3164,14 +3174,14 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ja.po b/po/ja.po index 0b495027e..75c762fb8 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2013-08-11 19:39+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -769,11 +769,11 @@ msgid "File not found" msgstr "ファイルが見つかりません" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -848,7 +848,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1631,8 +1631,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1670,7 +1670,7 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません" msgid "[Mirror: %s]" msgstr "[ミラー: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1679,7 +1679,7 @@ msgstr "" "mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れてい" "るようです。" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2739,80 +2739,90 @@ msgstr "パッケージファイル %s を解釈することができません ( msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3042,7 +3052,7 @@ msgstr "サイズが適合しません" msgid "Invalid file format" msgstr "不正な操作 %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3051,16 +3061,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3069,14 +3079,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3086,12 +3096,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3100,12 +3110,12 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/km.po b/po/km.po index 9729de5c1..46e41504b 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -725,11 +725,11 @@ msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -803,7 +803,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1573,8 +1573,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1612,14 +1612,14 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2676,76 +2676,86 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1 msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "កំពុង​បើក​ %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2963,35 +2973,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" msgid "Invalid file format" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2999,12 +3009,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3013,12 +3023,12 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ko.po b/po/ko.po index d6968b85f..76c37abde 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -732,11 +732,11 @@ msgid "File not found" msgstr "파일이 없습니다" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -811,7 +811,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1589,8 +1589,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1628,7 +1628,7 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1637,7 +1637,7 @@ msgstr "" "%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상된 것" "처럼 보입니다." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2696,77 +2696,87 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2986,35 +2996,35 @@ msgstr "크기가 맞지 않습니다" msgid "Invalid file format" msgstr "잘못된 작업 %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3024,12 +3034,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3038,12 +3048,12 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ku.po b/po/ku.po index 7777615c3..fb64505e3 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -645,12 +645,12 @@ msgid "File not found" msgstr "Pel nehate dîtin" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "" @@ -723,7 +723,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1477,8 +1477,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1516,14 +1516,14 @@ msgstr "Nikarî pelê %s veke" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2519,76 +2519,86 @@ msgstr "Pakêt nehate dîtin %s" msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" +#: apt-pkg/sourcelist.cc:340 +#, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "" + +#: apt-pkg/sourcelist.cc:348 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2798,35 +2808,35 @@ msgstr "Mezinahî li hev nayên" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2834,24 +2844,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/lt.po b/po/lt.po index 12ec54dbc..ea278bd13 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -649,11 +649,11 @@ msgid "File not found" msgstr "Failas nerastas" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "" @@ -726,7 +726,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1495,8 +1495,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1534,14 +1534,14 @@ msgstr "Nepavyko atverti failo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2608,76 +2608,86 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Atveriama %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" +#: apt-pkg/sourcelist.cc:340 +#, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "" + +#: apt-pkg/sourcelist.cc:348 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2890,35 +2900,35 @@ msgstr "Neatitinka dydžiai" msgid "Invalid file format" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2926,24 +2936,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/mr.po b/po/mr.po index ee2238550..838f3c67a 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -721,11 +721,11 @@ msgid "File not found" msgstr "फाईल सापडली नाही" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -800,7 +800,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1577,8 +1577,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1616,14 +1616,14 @@ msgstr "%s फाईल उघडता येत नाही" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2680,76 +2680,86 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s उघडत आहे" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2971,35 +2981,35 @@ msgstr "आकार जुळतनाही" msgid "Invalid file format" msgstr "%s अवैध क्रिया" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3007,12 +3017,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3021,12 +3031,12 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/nb.po b/po/nb.po index 3cca09bb2..68aa842cc 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -738,11 +738,11 @@ msgid "File not found" msgstr "Fant ikke fila" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -817,7 +817,7 @@ msgstr "Et svar oversvømte bufferen." msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1602,8 +1602,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1641,7 +1641,7 @@ msgstr "Ingen speilfil «%s» funnet" msgid "[Mirror: %s]" msgstr "[Speil: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1650,7 +1650,7 @@ msgstr "" "Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen ser " "ut til å være korrupt." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2714,76 +2714,86 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3004,36 +3014,36 @@ msgstr "Feil størrelse" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3043,12 +3053,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3057,12 +3067,12 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ne.po b/po/ne.po index 660924b79..b6446a091 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -723,11 +723,11 @@ msgid "File not found" msgstr "फाइल फेला परेन " #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -802,7 +802,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1574,8 +1574,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1613,14 +1613,14 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2678,76 +2678,86 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2965,35 +2975,35 @@ msgstr "साइज मेल खाएन" msgid "Invalid file format" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3001,12 +3011,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3015,12 +3025,12 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/nl.po b/po/nl.po index 150c456e4..697892993 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -749,11 +749,11 @@ msgid "File not found" msgstr "Bestand niet gevonden" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -828,7 +828,7 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1622,8 +1622,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1661,7 +1661,7 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1670,7 +1670,7 @@ msgstr "" "Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt " "beschadigd te zijn." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2748,77 +2748,87 @@ msgstr "Kon pakketbestand %s niet ontleden (1)" msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3051,36 +3061,36 @@ msgstr "Grootte komt niet overeen" msgid "Invalid file format" msgstr "Ongeldige operatie %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3091,12 +3101,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3105,12 +3115,12 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/nn.po b/po/nn.po index 6cb37a7a3..b9f38e940 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -732,11 +732,11 @@ msgid "File not found" msgstr "Fann ikkje fila" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -811,7 +811,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1585,8 +1585,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1624,14 +1624,14 @@ msgstr "Klarte ikkje opna fila %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2684,76 +2684,86 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2977,35 +2987,35 @@ msgstr "Feil storleik" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3013,12 +3023,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3027,12 +3037,12 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/pl.po b/po/pl.po index 7f42430fa..29828df57 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -775,11 +775,11 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -856,7 +856,7 @@ msgstr "Odpowiedź przepełniła bufor." msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1662,8 +1662,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1701,7 +1701,7 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1710,7 +1710,7 @@ msgstr "" "Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - łatka " "wygląda na uszkodzoną." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2781,78 +2781,88 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3077,7 +3087,7 @@ msgstr "Błędny rozmiar" msgid "Invalid file format" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3086,16 +3096,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3104,12 +3114,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3119,12 +3129,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3133,12 +3143,12 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/pt.po b/po/pt.po index 2ca93d930..dc53f4fcc 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -768,11 +768,11 @@ msgid "File not found" msgstr "Ficheiro não encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -847,7 +847,7 @@ msgstr "Uma resposta sobrecarregou o buffer." msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1635,8 +1635,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1674,7 +1674,7 @@ msgstr "Não pode ler ficheiro de mirror '%s'" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1683,7 +1683,7 @@ msgstr "" "Não foi possível aplicar o patch %s com mmap e com a utilização de operação " "de ficheiro - o patch parece estar corrompido." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2758,79 +2758,89 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3065,7 +3075,7 @@ msgstr "Tamanho incorrecto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3074,18 +3084,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3094,12 +3104,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3110,12 +3120,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3125,12 +3135,12 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/pt_BR.po b/po/pt_BR.po index 05027f37c..2976484a7 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -739,11 +739,11 @@ msgid "File not found" msgstr "Fișier negăsit" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -818,7 +818,7 @@ msgstr "Un răspuns a depășit zona de tampon." msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1613,8 +1613,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1652,14 +1652,14 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2731,76 +2731,86 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3028,37 +3038,37 @@ msgstr "Nepotrivire dimensiune" msgid "Invalid file format" msgstr "Operațiune invalidă %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3066,12 +3076,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3080,12 +3090,12 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ru.po b/po/ru.po index 74e1e9ee3..f01dba2f2 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -773,11 +773,11 @@ msgid "File not found" msgstr "Файл не найден" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -854,7 +854,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1656,8 +1656,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1695,7 +1695,7 @@ msgstr "Невозможно прочитать файл на зеркале «% msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1704,7 +1704,7 @@ msgstr "" "Не удалось наложить заплату %s с использованием mmap и файловой операции — " "вероятно, повреждена заплата." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2782,80 +2782,90 @@ msgstr "Невозможно разобрать содержимое пакет msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет " "значения)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3084,7 +3094,7 @@ msgstr "Не совпадает размер" msgid "Invalid file format" msgstr "Неверная операция %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3093,16 +3103,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3111,12 +3121,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3126,12 +3136,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3140,12 +3150,12 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/sk.po b/po/sk.po index a1a2aff50..855a6c0fe 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -759,11 +759,11 @@ msgid "File not found" msgstr "Súbor sa nenašiel" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -838,7 +838,7 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1630,8 +1630,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1669,7 +1669,7 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1678,7 +1678,7 @@ msgstr "" "Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - zdá " "sa, že záplata je poškodená." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2737,77 +2737,87 @@ msgstr "Súbor %s sa nedá spracovať (1)" msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3029,7 +3039,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Invalid file format" msgstr "Neplatná operácia %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3038,16 +3048,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3056,12 +3066,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3071,12 +3081,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3085,12 +3095,12 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/sl.po b/po/sl.po index ebf149be0..b79fae756 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -754,11 +754,11 @@ msgid "File not found" msgstr "Datoteke ni mogoče najti" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -833,7 +833,7 @@ msgstr "Odgovor je prekoračil predpomnilnik." msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1629,8 +1629,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1668,7 +1668,7 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1677,7 +1677,7 @@ msgstr "" "%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je " "videti pokvarjen" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2738,82 +2738,92 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče " "razčleniti)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima " "vrednosti)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Odpiranje %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3033,7 +3043,7 @@ msgstr "Neujemanje velikosti" msgid "Invalid file format" msgstr "Neveljavno opravilo %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3042,16 +3052,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3060,12 +3070,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3075,12 +3085,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3089,12 +3099,12 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/sv.po b/po/sv.po index 57da1162d..52868b94d 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -739,11 +739,11 @@ msgid "File not found" msgstr "Filen hittades inte" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -818,7 +818,7 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1619,8 +1619,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1659,7 +1659,7 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "[Mirror: %s]" msgstr "[Spegel: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1668,7 +1668,7 @@ msgstr "" "Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen " "verkar vara skadad." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2739,76 +2739,86 @@ msgstr "Kunde inte tolka paketfilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Rad %lu i källistan %s har fel format ([option] för kort)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3033,35 +3043,35 @@ msgstr "Storleken stämmer inte" msgid "Invalid file format" msgstr "Felaktig åtgärd %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3072,12 +3082,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3086,12 +3096,12 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/th.po b/po/th.po index 509107d08..efaedaa6e 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -740,11 +740,11 @@ msgid "File not found" msgstr "ไม่พบแฟ้ม" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -817,7 +817,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1586,8 +1586,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1625,14 +1625,14 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "ไม่สามารถปรับแก้ %s ด้วย mmap และการกระทำแฟ้ม - ดูเหมือนแพตช์จะเสีย" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2678,76 +2678,86 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1 msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "กำลังเปิด %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2966,7 +2976,7 @@ msgstr "ขนาดไม่ตรงกัน" msgid "Invalid file format" msgstr "ไม่รู้จักคำสั่ง %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2975,16 +2985,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2993,12 +3003,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3008,24 +3018,24 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/tl.po b/po/tl.po index 05d606f97..2c3b26bef 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -736,11 +736,11 @@ msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -815,7 +815,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1597,8 +1597,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1636,14 +1636,14 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2715,76 +2715,86 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3012,35 +3022,35 @@ msgstr "Di tugmang laki" msgid "Invalid file format" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3048,12 +3058,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3062,12 +3072,12 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/tr.po b/po/tr.po index beead72f9..37ca4cd78 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2013-02-18 03:41+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish\n" @@ -761,11 +761,11 @@ msgid "File not found" msgstr "Dosya bulunamadı" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -840,7 +840,7 @@ msgstr "Bir yanıt arabelleği taşırdı." msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1628,8 +1628,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1667,7 +1667,7 @@ msgstr "Yansı dosyası %s okunamıyor" msgid "[Mirror: %s]" msgstr "[Yansı: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1675,7 +1675,7 @@ msgid "" msgstr "" "%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi duruyor." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2747,87 +2747,98 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)" msgid "Unable to parse package file %s (2)" msgstr "Paket dosyası %s ayrıştırılamadı (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] " "ayrıştırılamıyor)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama " "değil)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin " "anahtarı yok)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s " "anahtarına değer atanmamış)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "%s Açılıyor" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3053,7 +3064,7 @@ msgstr "Boyutlar eşleşmiyor" msgid "Invalid file format" msgstr "Geçersiz işlem: %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3062,17 +3073,17 @@ msgstr "" "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " "dosyasındaki girdi ya da satır hatalı)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3081,12 +3092,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3096,12 +3107,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3110,12 +3121,12 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/uk.po b/po/uk.po index a6858646e..8fe66aa2f 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -772,12 +772,12 @@ msgid "File not found" msgstr "Файл не знайдено" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -852,7 +852,7 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1648,8 +1648,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1687,7 +1687,7 @@ msgstr "Неможливо прочитати файл дзеркала '%s'" msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1696,7 +1696,7 @@ msgstr "" "Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає " "пошкодженим." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2782,78 +2782,88 @@ msgstr "Неможливо проаналізувати файл пакунку msgid "Unable to parse package file %s (2)" msgstr "Неможливо проаналізувати файл пакунку %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Рядок %u є занадто довгим у переліку джерел %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворений рядок %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3077,7 +3087,7 @@ msgstr "Невідповідність розміру" msgid "Invalid file format" msgstr "Невірна дія %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3086,16 +3096,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3104,12 +3114,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3119,12 +3129,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3133,12 +3143,12 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/vi.po b/po/vi.po index 905cadd43..d3e04716a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2014-01-01 13:45+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -793,11 +793,11 @@ msgid "File not found" msgstr "Không tìm thấy tập tin" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -872,7 +872,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1652,8 +1652,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1691,7 +1691,7 @@ msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”" msgid "[Mirror: %s]" msgstr "[Bản sao: %s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -1699,7 +1699,7 @@ msgid "" msgstr "" "Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị hỏng." -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2784,85 +2784,95 @@ msgstr "Không thể phân tích tập tin gói %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " "tích được)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " "gán)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " "trị)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "Đang mở %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3086,7 +3096,7 @@ msgstr "Kích cỡ không khớp nhau" msgid "Invalid file format" msgstr "Định dạng tập tập tin không hợp lệ" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3095,16 +3105,16 @@ msgstr "" "Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " "sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3113,12 +3123,12 @@ msgstr "" "Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " "này sẽ không được áp dụng." -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3129,12 +3139,12 @@ msgstr "" "Lỗi GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3143,12 +3153,12 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/zh_CN.po b/po/zh_CN.po index 79ea2286e..1267e2211 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -728,11 +728,11 @@ msgid "File not found" msgstr "无法找到该文件" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -806,7 +806,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 #: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 #: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" @@ -1571,8 +1571,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 +#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1610,14 +1610,14 @@ msgstr "没有找到镜像文件 %s" msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rred.cc:491 +#: methods/rred.cc:499 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。" -#: methods/rred.cc:496 +#: methods/rred.cc:504 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -2667,76 +2667,86 @@ msgstr "无法解析软件包文件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:97 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:100 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/sourcelist.cc:111 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/sourcelist.cc:117 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/sourcelist.cc:120 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/sourcelist.cc:135 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/sourcelist.cc:138 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/sourcelist.cc:151 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/sourcelist.cc:262 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:298 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:302 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" +#: apt-pkg/sourcelist.cc:340 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" + +#: apt-pkg/sourcelist.cc:348 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" + #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2956,35 +2966,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "无效的操作 %s" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/acquire-item.cc:1566 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1582 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1624 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1662 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/acquire-item.cc:1684 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/acquire-item.cc:1714 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2993,12 +3003,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1852 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3007,12 +3017,12 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/acquire-item.cc:1918 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/acquire-item.cc:1976 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/zh_TW.po b/po/zh_TW.po index dedc5ae49..3c8e7f9d9 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 \n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-05 10:10+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] Date: Sun, 5 Jan 2014 19:41:15 +0100 Subject: debian/rules: Call dh_makeshlibs for 'apt' The package ships libapt-private now, so we need an ldconfig call in postinst. dh_makeshlibs creates one for us. Reported-by: lintian --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index f4f7ec06b..3aa86480e 100755 --- a/debian/rules +++ b/debian/rules @@ -217,6 +217,7 @@ apt: build-binary build-manpages debian/apt.install dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ + dh_makeshlibs -p$@ dh_installdeb -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)" -- cgit v1.2.3 From e093518c03b49a2def83d8b680be4490fed6e69c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 5 Jan 2014 19:41:15 +0100 Subject: debian/rules: Call dh_makeshlibs for 'apt' The package ships libapt-private now, so we need an ldconfig call in postinst. dh_makeshlibs creates one for us. Reported-by: lintian --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index f4f7ec06b..3aa86480e 100755 --- a/debian/rules +++ b/debian/rules @@ -217,6 +217,7 @@ apt: build-binary build-manpages debian/apt.install dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ + dh_makeshlibs -p$@ dh_installdeb -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)" -- cgit v1.2.3 From c189f87d57844a13619ec387916f49aba171c1b3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Jan 2014 08:12:28 +0100 Subject: flock() the file edited in edit-sources --- apt-private/private-sources.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc index 65706e785..41cf6b313 100644 --- a/apt-private/private-sources.cc +++ b/apt-private/private-sources.cc @@ -32,6 +32,10 @@ bool EditSources(CommandLine &CmdL) if (FileExists(sourceslist)) before.FromFile(sourceslist); + int lockfd = GetLock(sourceslist); + if (lockfd < 0) + return false; + do { EditFileInSensibleEditor(sourceslist); _error->PushToStack(); @@ -46,6 +50,7 @@ bool EditSources(CommandLine &CmdL) } _error->RevertToStack(); } while (res == false); + close(lockfd); if (FileExists(sourceslist) && !before.VerifyFile(sourceslist)) { strprintf( -- cgit v1.2.3 From 181d587044121448e4d9925cc18ffb404b7b4a9c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Jan 2014 08:35:51 +0100 Subject: document deb822 style sources.list --- doc/sources.list.5.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 87fb4d71e..ef5219ec2 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -76,12 +76,27 @@ code in the same form as the deb type. A deb-src line is required to fetch source indexes. - The format for a sources.list entry using the deb and deb-src types is: deb [ options ] uri distribution [component1] [component2] [...] + Alternatively a rfc822 style format is also supported: + + Type: deb + URI: http://example.com + Dist: stable + Section: component1 component2 + [option1]: [option1-value] + + Type: deb-src + URI: http://example.com + Dist: stable + Section: component1 component2 + [option1]: [option1-value] + + + The URI for the deb type must specify the base of the Debian distribution, from which APT will find the information it needs. distribution can specify an exact path, in which case the -- cgit v1.2.3 From f7c7f4821e8050b6185c652215e639cbc0089769 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 10 Dec 2013 15:37:02 +0100 Subject: use C.UTF-8 in testcases as locale Git-Dch: Ignore --- test/integration/framework | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index a28363768..8aacb7456 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -202,7 +202,7 @@ setupenvironment() { echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf echo 'quiet::NoUpdate "true";' >> aptconfig.conf echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https - export LC_ALL=C + export LC_ALL=C.UTF-8 export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" configcompression '.' 'gz' #'bz2' 'lzma' 'xz' msgdone "info" @@ -288,7 +288,7 @@ setupsimplenativepackage() { local VERSION="$3" local RELEASE="${4:-unstable}" local DEPENDENCIES="$5" - local DESCRIPTION="${6:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" @@ -338,7 +338,7 @@ buildsimplenativepackage() { local VERSION="$3" local RELEASE="${4:-unstable}" local DEPENDENCIES="$5" - local DESCRIPTION="${6:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" @@ -535,7 +535,7 @@ insertpackage() { local VERSION="$4" local DEPENDENCIES="$5" local PRIORITY="${6:-optional}" - local DESCRIPTION="${7:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" @@ -595,7 +595,7 @@ insertinstalledpackage() { local DEPENDENCIES="$4" local PRIORITY="${5:-optional}" local STATUS="${6:-install ok installed}" - local DESCRIPTION="${7:-"Description: an autogenerated dummy ${NAME}=${VERSION}/installed + local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/installed If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" -- cgit v1.2.3 From bf9e744761f605e537878b7524ea9023493e4c5b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 10 Dec 2013 18:23:47 +0100 Subject: tests: default to 'sid' codename for 'unstable' Git-Dch: Ignore --- test/integration/framework | 7 ++++++- test/integration/test-ubuntu-bug-784473-InRelease-one-message-only | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 8aacb7456..60a8167fa 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -662,7 +662,12 @@ compressfile() { } # can be overridden by testcases for their pleasure -getcodenamefromsuite() { echo -n "$1"; } +getcodenamefromsuite() { + case "$1" in + unstable) echo 'sid';; + *) echo -n "$1";; + esac +} getreleaseversionfromsuite() { true; } getlabelfromsuite() { true; } diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only index e9d684309..50ca2bf57 100755 --- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only +++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only @@ -35,5 +35,5 @@ testequal "Package files: 100 ${ROOTDIR}/rootdir/var/lib/dpkg/status release a=now 500 file:${ROOTDIR}/aptarchive/ unstable/main i386 Packages - release a=unstable,n=unstable,c=main + release a=unstable,n=sid,c=main Pinned packages:" aptcache policy -- cgit v1.2.3 From c5909dcfdc65ce8120d641227976ba4597fd3e70 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 11 Dec 2013 13:39:51 +0100 Subject: test apt-get source release selection with suite and codename Git-Dch: Ignore --- test/integration/test-apt-get-source | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source index 3ee7a9e23..083e26db1 100755 --- a/test/integration/test-apt-get-source +++ b/test/integration/test-apt-get-source @@ -39,12 +39,24 @@ Need to get 0 B of source archives. 'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e 'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo -# select by release +# select by release: suite testequal "$HEADER Selected version '1.0' (stable) for foo Need to get 0 B of source archives. 'file://${APTARCHIVE}/foo_1.0.dsc' foo_1.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e 'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo/stable +testequal "$HEADER +Selected version '2.0' (unstable) for foo +Need to get 0 B of source archives. +'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e +'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo/unstable + +# select by release: codename +testequal "$HEADER +Selected version '2.0' (sid) for foo +Need to get 0 B of source archives. +'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e +'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo/sid # select by version testequal "$HEADER -- cgit v1.2.3 From 1e4a2b763f2225d6de3d498263da2a1a12697667 Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Wed, 15 Jan 2014 15:55:26 +0100 Subject: correct IndexDiff vs DiffIndex in Debug output --- apt-pkg/acquire-item.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b5b9577ef..73f5f4901 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -369,10 +369,10 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, return; } - if(Debug) - std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): " - << CurrentPackagesFile << std::endl; - + if(Debug) + std::clog << "pkgAcqDiffIndex::pkgAcqDiffIndex(): " + << CurrentPackagesFile << std::endl; + QueueURI(Desc); } @@ -398,8 +398,8 @@ string pkgAcqDiffIndex::Custom600Headers() bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ { if(Debug) - std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile - << std::endl; + std::clog << "pkgAcqDiffIndex::ParseIndexDiff() " << IndexDiffFile + << std::endl; pkgTagSection Tags; string ServerSha1; -- cgit v1.2.3 From c3a17127ad383ec8e1f480ff2e1a4dccaa537a11 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 27 Dec 2013 14:52:15 +0100 Subject: reenable unlimited pdiff files download In 51fc6def77edfb1f429a48e5169519e9e05a759b we limited the amount of pdiff to be downloaded per index to 20. This was a compromise between not letting it go overboard (becoming even slower) and not using bandwidth needlessly. Now that with the POC the speed reason is gone it makes sense again to download as much files as we possible can via pdiff to save bandwidth (and possibly even time). It also avoids problems with the limit in cases we were we deal with a server merged archieve as this limit assumes a strict patch progression. --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 73f5f4901..7f6443555 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -462,7 +462,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ if (available_patches.empty() == false) { // patching with too many files is rather slow compared to a fast download - unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 20); + unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 0); if (fileLimit != 0 && fileLimit < available_patches.size()) { if (Debug) -- cgit v1.2.3 From 9aaa45283b14c3c81641f3f3e38157a267b1e8f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 15 Jan 2014 16:14:23 +0100 Subject: actually register the tempfile removal atexit Git-Dch: Ignore --- test/libapt/sourcelist_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 6e83d08e0..adadae6a7 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -36,6 +36,7 @@ int main(int argc, char *argv[]) ; FileFd fd; + atexit(remove_tmpfile); tempfile = strdup("apt-test.XXXXXXXX"); tempfile_fd = mkstemp(tempfile); -- cgit v1.2.3 From dbd5418b895c0ae3d6585ad38bd40920a456855e Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Wed, 15 Jan 2014 16:33:36 +0100 Subject: reimplement rred to allow applying all the diffs in a single pass Based on the idea presented in: https://lists.debian.org/deity/2009/08/msg00169.html and https://lists.debian.org/debian-devel/2014/01/msg00081.html It reads all patches one by one and merges them in-memory before applying the merged changes to the index. Beware: This commit by David Kalnischkies rips out the rred binary rewrite unchanged (expect minor format issue corrections) from the proposed changes, so this commit alone BREAKS pdiff completely. The integration into the acquire system as it was prepared in the previous POC will be done in the next commit to have proper 'blame'. --- methods/rred.cc | 1284 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 684 insertions(+), 600 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index bea8ed263..ed3fcc82e 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -1,4 +1,10 @@ -// Includes /*{{{*/ +// Copyright (c) 2014 Anthony Towns +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. + #include #include @@ -9,627 +15,705 @@ #include #include +#include +#include +#include +#include + +#include +#include +#include +#include #include -#include -#include -#include -#include #include -#include -#include + #include - /*}}}*/ -/** \brief RredMethod - ed-style incremential patch method {{{ - * - * This method implements a patch functionality similar to "patch --ed" that is - * used by the "tiffany" incremental packages download stuff. It differs from - * "ed" insofar that it is way more restricted (and therefore secure). - * The currently supported ed commands are "change", "add" and - * "delete" (diff doesn't output any other). - * Additionally the records must be reverse sorted by line number and - * may not overlap (diff *seems* to produce this kind of output). - * */ -class RredMethod : public pkgAcqMethod { - bool Debug; - // the size of this doesn't really matter (except for performance) - const static int BUF_SIZE = 1024; - // the supported ed commands - enum Mode {MODE_CHANGED='c', MODE_DELETED='d', MODE_ADDED='a'}; - // return values - enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED}; - - State applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file, - unsigned long &line, char *buffer, Hashes *hash) const; - void ignoreLineInFile(FileFd &fin, char *buffer) const; - void copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines, - Hashes *hash, char *buffer) const; - - State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; - State patchMMap(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; - -protected: - // the methods main method - virtual bool Fetch(FetchItem *Itm); - -public: - RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig), Debug(false) {}; + +#define BLOCK_SIZE (512*1024) + +class MemBlock { + char *start; + size_t size; + char *free; + struct MemBlock *next; + + MemBlock(size_t size) + { + free = start = new char[size]; + size = size; + next = NULL; + } + + size_t avail(void) { return size - (free - start); } + + public: + + MemBlock(void) { + free = start = new char[BLOCK_SIZE]; + size = BLOCK_SIZE; + next = NULL; + } + + ~MemBlock() { + delete [] start; + delete next; + } + + void clear(void) { + free = start; + if (next) + next->clear(); + } + + char *add_easy(char *src, size_t len, char *last) + { + if (last) { + for (MemBlock *k = this; k; k = k->next) { + if (k->free == last) { + if (len <= k->avail()) { + char *n = k->add(src, len); + assert(last == n); + if (last == n) + return NULL; + return n; + } else { + break; + } + } else if (last >= start && last < free) { + break; + } + } + } + return add(src, len); + } + + char *add(char *src, size_t len) { + if (len > avail()) { + if (!next) { + if (len > BLOCK_SIZE) { + next = new MemBlock(len); + } else { + next = new MemBlock; + } + } + return next->add(src, len); + } + char *dst = free; + free += len; + memcpy(dst, src, len); + return dst; + } }; - /*}}}*/ -/** \brief applyFile - in reverse order with a tail recursion {{{ - * - * As it is expected that the commands are in reversed order in the patch file - * we check in the first half if the command is valid, but doesn't execute it - * and move a step deeper. After reaching the end of the file we apply the - * patches in the correct order: last found command first. - * - * \param ed_cmds patch file to apply - * \param in_file base file we want to patch - * \param out_file file to write the patched result to - * \param line of command operation - * \param buffer internal used read/write buffer - * \param hash the created file for correctness - * \return the success State of the ed command executor - */ -RredMethod::State RredMethod::applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file, - unsigned long &line, char *buffer, Hashes *hash) const { - // get the current command and parse it - if (ed_cmds.ReadLine(buffer, BUF_SIZE) == NULL) { - if (Debug == true) - std::clog << "rred: encounter end of file - we can start patching now." << std::endl; - line = 0; - return ED_OK; - } - - // parse in the effected linenumbers - char* idx; - errno=0; - unsigned long const startline = strtol(buffer, &idx, 10); - if (errno == ERANGE || errno == EINVAL) { - _error->Errno("rred", "startline is an invalid number"); - return ED_PARSER; - } - if (startline > line) { - _error->Error("rred: The start line (%lu) of the next command is higher than the last line (%lu). This is not allowed.", startline, line); - return ED_ORDERING; - } - unsigned long stopline; - if (*idx == ',') { - idx++; - errno=0; - stopline = strtol(idx, &idx, 10); - if (errno == ERANGE || errno == EINVAL) { - _error->Errno("rred", "stopline is an invalid number"); - return ED_PARSER; - } - } - else { - stopline = startline; - } - line = startline; - - // which command to execute on this line(s)? - switch (*idx) { - case MODE_CHANGED: - if (Debug == true) - std::clog << "Change from line " << startline << " to " << stopline << std::endl; - break; - case MODE_ADDED: - if (Debug == true) - std::clog << "Insert after line " << startline << std::endl; - break; - case MODE_DELETED: - if (Debug == true) - std::clog << "Delete from line " << startline << " to " << stopline << std::endl; - break; - default: - _error->Error("rred: Unknown ed command '%c'. Abort.", *idx); - return ED_PARSER; - } - unsigned char mode = *idx; - - // save the current position - unsigned const long long pos = ed_cmds.Tell(); - - // if this is add or change then go to the next full stop - unsigned int data_length = 0; - if (mode == MODE_CHANGED || mode == MODE_ADDED) { - do { - ignoreLineInFile(ed_cmds, buffer); - data_length++; - } - while (strncmp(buffer, ".", 1) != 0); - data_length--; // the dot should not be copied - } - - // do the recursive call - the last command is the one we need to execute at first - const State child = applyFile(ed_cmds, in_file, out_file, line, buffer, hash); - if (child != ED_OK) { - return child; - } - - // change and delete are working on "line" - add is done after "line" - if (mode != MODE_ADDED) - line++; - - // first wind to the current position and copy over all unchanged lines - if (line < startline) { - copyLinesFromFileToFile(in_file, out_file, (startline - line), hash, buffer); - line = startline; - } - - if (mode != MODE_ADDED) - line--; - - // include data from ed script - if (mode == MODE_CHANGED || mode == MODE_ADDED) { - ed_cmds.Seek(pos); - copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer); - } - - // ignore the corresponding number of lines from input - if (mode == MODE_CHANGED || mode == MODE_DELETED) { - while (line < stopline) { - ignoreLineInFile(in_file, buffer); - line++; - } - } - return ED_OK; -} - /*}}}*/ -void RredMethod::copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines,/*{{{*/ - Hashes *hash, char *buffer) const { - while (0 < lines--) { - do { - fin.ReadLine(buffer, BUF_SIZE); - unsigned long long const towrite = strlen(buffer); - fout.Write(buffer, towrite); - hash->Add((unsigned char*)buffer, towrite); - } while (strlen(buffer) == (BUF_SIZE - 1) && - buffer[BUF_SIZE - 2] != '\n'); - } -} - /*}}}*/ -void RredMethod::ignoreLineInFile(FileFd &fin, char *buffer) const { /*{{{*/ - fin.ReadLine(buffer, BUF_SIZE); - while (strlen(buffer) == (BUF_SIZE - 1) && - buffer[BUF_SIZE - 2] != '\n') { - fin.ReadLine(buffer, BUF_SIZE); - buffer[0] = ' '; - } -} - /*}}}*/ -RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ - FileFd &out_file, Hashes *hash) const { - char buffer[BUF_SIZE]; - - /* we do a tail recursion to read the commands in the right order */ - unsigned long line = -1; // assign highest possible value - State const result = applyFile(Patch, From, out_file, line, buffer, hash); - - /* read the rest from infile */ - if (result == ED_OK) { - while (From.ReadLine(buffer, BUF_SIZE) != NULL) { - unsigned long long const towrite = strlen(buffer); - out_file.Write(buffer, towrite); - hash->Add((unsigned char*)buffer, towrite); + +struct Change { + /* Ordering: + * + * 1. write out lines unchanged + * 2. skip lines from source + * 3. write out lines (/) + */ + size_t offset; + size_t del_cnt; + size_t add_cnt; /* lines */ + size_t add_len; /* bytes */ + char *add; + + Change(int off) + { + offset = off; + del_cnt = add_cnt = add_len = 0; + add = NULL; + } + + /* actually, don't write lines from */ + void skip_lines(size_t lines) + { + while (lines > 0) { + char *s = (char*) memchr(add, '\n', add_len); + assert(s != NULL); + s++; + add_len -= (s - add); + add_cnt--; + lines--; + if (add_len == 0) { + add = NULL; + assert(add_cnt == 0); + assert(lines == 0); + } else { + add = s; + assert(add_cnt > 0); + } } } - return result; -} - /*}}}*/ -/* struct EdCommand {{{*/ -#ifdef _POSIX_MAPPED_FILES -struct EdCommand { - size_t data_start; - size_t data_end; - size_t data_lines; - size_t first_line; - size_t last_line; - char type; }; -#define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */ -static ssize_t retry_writev(int fd, const struct iovec *iov, int iovcnt) { - ssize_t Res; - errno = 0; - ssize_t i = 0; - do { - Res = writev(fd, iov + i, iovcnt); - if (Res < 0 && errno == EINTR) - continue; - if (Res < 0) - return _error->Errno("writev",_("Write error")); - iovcnt -= Res; - i += Res; - } while (Res > 0 && iovcnt > 0); - return i; -} -#endif - /*}}}*/ -RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ - FileFd &out_file, Hashes *hash) const { -#ifdef _POSIX_MAPPED_FILES - MMap ed_cmds(Patch, MMap::ReadOnly); - MMap in_file(From, MMap::ReadOnly); - - unsigned long long const ed_size = ed_cmds.Size(); - unsigned long long const in_size = in_file.Size(); - if (ed_size == 0 || in_size == 0) - return MMAP_FAILED; - - EdCommand* commands = 0; - size_t command_count = 0; - size_t command_alloc = 0; - - const char* begin = (char*) ed_cmds.Data(); - const char* end = begin; - const char* ed_end = (char*) ed_cmds.Data() + ed_size; - - const char* input = (char*) in_file.Data(); - const char* input_end = (char*) in_file.Data() + in_size; - - size_t i; - - /* 1. Parse entire script. It is executed in reverse order, so we cather it - * in the `commands' buffer first - */ - - for(;;) { - EdCommand cmd; - cmd.data_start = 0; - cmd.data_end = 0; - - while(begin != ed_end && *begin == '\n') - ++begin; - while(end != ed_end && *end != '\n') - ++end; - if(end == ed_end && begin == end) - break; - - /* Determine command range */ - const char* tmp = begin; - - for(;;) { - /* atoll is safe despite lacking NUL-termination; we know there's an - * alphabetic character at end[-1] - */ - if(tmp == end) { - cmd.first_line = atol(begin); - cmd.last_line = cmd.first_line; - break; - } - if(*tmp == ',') { - cmd.first_line = atol(begin); - cmd.last_line = atol(tmp + 1); - break; - } - ++tmp; - } - - // which command to execute on this line(s)? - switch (end[-1]) { - case MODE_CHANGED: - if (Debug == true) - std::clog << "Change from line " << cmd.first_line << " to " << cmd.last_line << std::endl; - break; - case MODE_ADDED: - if (Debug == true) - std::clog << "Insert after line " << cmd.first_line << std::endl; - break; - case MODE_DELETED: - if (Debug == true) - std::clog << "Delete from line " << cmd.first_line << " to " << cmd.last_line << std::endl; - break; - default: - _error->Error("rred: Unknown ed command '%c'. Abort.", end[-1]); - free(commands); - return ED_PARSER; - } - cmd.type = end[-1]; - - /* Determine the size of the inserted text, so we don't have to scan this - * text again later. - */ - begin = end + 1; - end = begin; - cmd.data_lines = 0; - - if(cmd.type == MODE_ADDED || cmd.type == MODE_CHANGED) { - cmd.data_start = begin - (char*) ed_cmds.Data(); - while(end != ed_end) { - if(*end == '\n') { - if(end[-1] == '.' && end[-2] == '\n') - break; - ++cmd.data_lines; - } - ++end; - } - cmd.data_end = end - (char*) ed_cmds.Data() - 1; - begin = end + 1; - end = begin; - } - if(command_count == command_alloc) { - command_alloc = (command_alloc + 64) * 3 / 2; - EdCommand* newCommands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand)); - if (newCommands == NULL) { - free(commands); - return MMAP_FAILED; - } - commands = newCommands; - } - commands[command_count++] = cmd; - } - - struct iovec* iov = new struct iovec[IOV_COUNT]; - size_t iov_size = 0; - - size_t amount, remaining; - size_t line = 1; - EdCommand* cmd; - - /* 2. Execute script. We gather writes in a `struct iov' array, and flush - * using writev to minimize the number of system calls. Data is read - * directly from the memory mappings of the input file and the script. - */ - - for(i = command_count; i-- > 0; ) { - cmd = &commands[i]; - if(cmd->type == MODE_ADDED) - amount = cmd->first_line + 1; - else - amount = cmd->first_line; - - if(line < amount) { - begin = input; - while(line != amount) { - input = (const char*) memchr(input, '\n', input_end - input); - if(!input) - break; - ++line; - ++input; - } - - iov[iov_size].iov_base = (void*) begin; - iov[iov_size].iov_len = input - begin; - hash->Add((const unsigned char*) begin, input - begin); - - if(++iov_size == IOV_COUNT) { - retry_writev(out_file.Fd(), iov, IOV_COUNT); - iov_size = 0; - } - } - - if(cmd->type == MODE_DELETED || cmd->type == MODE_CHANGED) { - remaining = (cmd->last_line - cmd->first_line) + 1; - line += remaining; - while(remaining) { - input = (const char*) memchr(input, '\n', input_end - input); - if(!input) - break; - --remaining; - ++input; - } - } - - if(cmd->type == MODE_CHANGED || cmd->type == MODE_ADDED) { - if(cmd->data_end != cmd->data_start) { - iov[iov_size].iov_base = (void*) ((char*)ed_cmds.Data() + cmd->data_start); - iov[iov_size].iov_len = cmd->data_end - cmd->data_start; - hash->Add((const unsigned char*) ((char*)ed_cmds.Data() + cmd->data_start), - iov[iov_size].iov_len); - - if(++iov_size == IOV_COUNT) { - retry_writev(out_file.Fd(), iov, IOV_COUNT); - iov_size = 0; - } - } - } - } - - if(input != input_end) { - iov[iov_size].iov_base = (void*) input; - iov[iov_size].iov_len = input_end - input; - hash->Add((const unsigned char*) input, input_end - input); - ++iov_size; - } - - if(iov_size) { - retry_writev(out_file.Fd(), iov, iov_size); - iov_size = 0; - } - - for(i = 0; i < iov_size; i += IOV_COUNT) { - if(iov_size - i < IOV_COUNT) - retry_writev(out_file.Fd(), iov + i, iov_size - i); - else - retry_writev(out_file.Fd(), iov + i, IOV_COUNT); - } - - delete [] iov; - free(commands); - - return ED_OK; + +class FileChanges { + std::list changes; + std::list::iterator where; + size_t pos; // line number is as far left of iterator as possible + + bool pos_is_okay(void) + { +#ifdef POSDEBUG + size_t cpos = 0; + std::list::iterator x; + for (x = changes.begin(); x != where; x++) { + assert(x != changes.end()); + cpos += x->offset + x->add_cnt; + } + return cpos == pos; #else - return MMAP_FAILED; + return true; #endif -} - /*}}}*/ -bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ -{ - Debug = _config->FindB("Debug::pkgAcquire::RRed", false); - URI Get = Itm->Uri; - std::string Path = Get.Host + Get.Path; // To account for relative paths - - FetchResult Res; - Res.Filename = Itm->DestFile; - if (Itm->Uri.empty() == true) { - Path = Itm->DestFile; - Itm->DestFile.append(".result"); - } else - URIStart(Res); - - std::string lastPatchName; - Hashes Hash; - - // check for a single ed file - if (FileExists(Path+".ed") == true) + } + + public: + FileChanges() { + where = changes.end(); + pos = 0; + } + + std::list::iterator begin(void) { return changes.begin(); } + std::list::iterator end(void) { return changes.end(); } + + std::list::reverse_iterator rbegin(void) { return changes.rbegin(); } + std::list::reverse_iterator rend(void) { return changes.rend(); } + + void add_change(Change c) { + assert(pos_is_okay()); + go_to_change_for(c.offset); + assert(pos + where->offset == c.offset); + if (c.del_cnt > 0) + delete_lines(c.del_cnt); + assert(pos + where->offset == c.offset); + if (c.add_len > 0) { + assert(pos_is_okay()); + if (where->add_len > 0) + new_change(); + assert(where->add_len == 0 && where->add_cnt == 0); + + where->add_len = c.add_len; + where->add_cnt = c.add_cnt; + where->add = c.add; + } + assert(pos_is_okay()); + merge(); + assert(pos_is_okay()); + } + + private: + void merge(void) + { + while (where->offset == 0 && where != changes.begin()) { + left(); + } + std::list::iterator next = where; + next++; + + while (next != changes.end() && next->offset == 0) { + where->del_cnt += next->del_cnt; + next->del_cnt = 0; + if (next->add == NULL) { + next = changes.erase(next); + } else if (where->add == NULL) { + where->add = next->add; + where->add_len = next->add_len; + where->add_cnt = next->add_cnt; + next = changes.erase(next); + } else { + next++; + } + } + } + + void go_to_change_for(size_t line) { - if (Debug == true) - std::clog << "Patching " << Path << " with " << Path - << ".ed and putting result into " << Itm->DestFile << std::endl; - - // Open the source and destination files - lastPatchName = Path + ".ed"; - FileFd From(Path,FileFd::ReadOnly); - FileFd To(Itm->DestFile,FileFd::WriteAtomic); - To.EraseOnFailure(); - FileFd Patch(lastPatchName, FileFd::ReadOnly, FileFd::Gzip); - if (_error->PendingError() == true) - return false; - - // now do the actual patching - State const result = patchMMap(Patch, From, To, &Hash); - if (result == MMAP_FAILED) { - // retry with patchFile - Patch.Seek(0); - From.Seek(0); - To.Open(Itm->DestFile,FileFd::WriteAtomic); - if (_error->PendingError() == true) - return false; - if (patchFile(Patch, From, To, &Hash) != ED_OK) { - return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str()); - } else if (Debug == true) { - std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl; + while(where != changes.end()) { + if (line < pos) { + left(); + continue; + } + if (pos + where->offset + where->add_cnt <= line) { + right(); + continue; + } + // line is somewhere in this slot + if (line < pos + where->offset) { + break; + } else if (line == pos + where->offset) { + return; + } else { + split(line - pos); + right(); + return; } - } else if (result != ED_OK) { - return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str()); - } else if (Debug == true) { - std::clog << "rred: finished mmap patching of " << Path << std::endl; } + /* it goes before this patch */ + insert(line-pos); + } + + void new_change(void) { insert(where->offset); } + + void insert(size_t offset) + { + assert(pos_is_okay()); + assert(where == changes.end() || offset <= where->offset); + if (where != changes.end()) + where->offset -= offset; + changes.insert(where, Change(offset)); + where--; + assert(pos_is_okay()); + } + + void split(size_t offset) + { + assert(pos_is_okay()); + + assert(where->offset < offset); + assert(offset < where->offset + where->add_cnt); + + size_t keep_lines = offset - where->offset; + + Change before(*where); - // write out the result - From.Close(); - Patch.Close(); - To.Close(); + where->del_cnt = 0; + where->offset = 0; + where->skip_lines(keep_lines); + + before.add_cnt = keep_lines; + before.add_len -= where->add_len; + + changes.insert(where, before); + where--; + assert(pos_is_okay()); } - else + + size_t check_next_offset(size_t max) { - if (Debug == true) - std::clog << "Patching " << Path << " with all " << Path << ".ed.*.gz files and " - << "putting result into " << Itm->DestFile << std::endl; - - int From = open(Path.c_str(), O_RDONLY); - unlink(Itm->DestFile.c_str()); - int To = open(Itm->DestFile.c_str(), O_WRONLY | O_CREAT | O_EXCL, 0644); - SetCloseExec(From, false); - SetCloseExec(To, false); - - _error->PushToStack(); - std::vector patches = GetListOfFilesInDir(flNotFile(Path), "gz", true, false); - _error->RevertToStack(); - - std::string externalrred = _config->Find("Dir::Bin::rred", "/usr/bin/diffindex-rred"); - std::vector Args; - Args.reserve(22); - Args.push_back(externalrred.c_str()); - - std::string const baseName = Path + ".ed."; - for (std::vector::const_iterator p = patches.begin(); - p != patches.end(); ++p) - if (p->compare(0, baseName.length(), baseName) == 0) - Args.push_back(p->c_str()); - - Args.push_back(NULL); - - pid_t Patcher = ExecFork(); - if (Patcher == 0) { - dup2(From, STDIN_FILENO); - dup2(To, STDOUT_FILENO); - - execvp(Args[0], (char **) &Args[0]); - std::cerr << "Failed to execute patcher " << Args[0] << "!" << std::endl; - _exit(100); + assert(pos_is_okay()); + if (max > 0) + { + where++; + if (where != changes.end()) { + if (where->offset < max) + max = where->offset; + } + where--; + assert(pos_is_okay()); } - // last is NULL, so the one before is the last patch - lastPatchName = Args[Args.size() - 2]; + return max; + } - if (ExecWait(Patcher, "rred") == false) - return _error->Errno("rred", "Patching via external rred failed"); + void delete_lines(size_t cnt) + { + std::list::iterator x = where; + assert(pos_is_okay()); + while (cnt > 0) + { + size_t del; + del = x->add_cnt; + if (del > cnt) + del = cnt; + x->skip_lines(del); + cnt -= del; + + x++; + if (x == changes.end()) { + del = cnt; + } else { + del = x->offset; + if (del > cnt) + del = cnt; + x->offset -= del; + } + where->del_cnt += del; + cnt -= del; + } + assert(pos_is_okay()); + } - close(From); - close(To); + void left(void) { + assert(pos_is_okay()); + where--; + pos -= where->offset + where->add_cnt; + assert(pos_is_okay()); + } - struct stat Buf; - if (stat(Itm->DestFile.c_str(), &Buf) != 0) - return _error->Errno("stat",_("Failed to stat")); + void right(void) { + assert(pos_is_okay()); + pos += where->offset + where->add_cnt; + where++; + assert(pos_is_okay()); + } +}; + +class Patch { + FileChanges filechanges; + MemBlock add_text; + + static void dump_rest(FILE *o, FILE *i, Hashes *hash) + { + char buffer[BLOCK_SIZE]; + size_t l; + while (0 < (l = fread(buffer, 1, sizeof(buffer), i))) { + fwrite(buffer, 1, l, o); + if (hash) + hash->Add((unsigned char*)buffer, l); + } + } + + static void dump_lines(FILE *o, FILE *i, size_t n, Hashes *hash) + { + char buffer[BLOCK_SIZE]; + size_t l; + while (n > 0) { + if (fgets(buffer, sizeof(buffer), i) == 0) + buffer[0] = '\0'; + l = strlen(buffer); + if (l == 0 || buffer[l-1] == '\n') + n--; + fwrite(buffer, 1, l, o); + + if (hash) + hash->Add((unsigned char*)buffer, l); + } + } + + static void skip_lines(FILE *i, int n) + { + char buffer[BLOCK_SIZE]; + size_t l; + while (n > 0) { + if (fgets(buffer, sizeof(buffer), i) == 0) + buffer[0] = '\0'; + l = strlen(buffer); + if (l == 0 || buffer[l-1] == '\n') + n--; + } + } + + static bool dump_mem(FILE *o, char *p, size_t s, Hashes *hash) { + size_t r; + while (s > 0) { + r = fwrite(p, 1, s, o); + if (hash) + hash->Add((unsigned char*)p, s); + s -= r; + p += r; + if (r == 0) return false; + } + return true; + } + + public: + + void read_diff(FILE *f) + { + char buffer[BLOCK_SIZE]; + bool cmdwanted = true; + + Change ch(0); + while(fgets(buffer, sizeof(buffer), f)) + { + if (cmdwanted) { + char *m, *c; + size_t s, e; + s = strtol(buffer, &m, 10); + if (m == buffer) { + s = e = ch.offset + ch.add_cnt; + c = buffer; + } else if (*m == ',') { + m++; + e = strtol(m, &c, 10); + } else { + e = s; + c = m; + } + switch(*c) { + case 'a': + cmdwanted = false; + ch.add = NULL; + ch.add_cnt = 0; + ch.add_len = 0; + ch.offset = s; + ch.del_cnt = 0; + break; + case 'c': + cmdwanted = false; + ch.add = NULL; + ch.add_cnt = 0; + ch.add_len = 0; + ch.offset = s - 1; + ch.del_cnt = e - s + 1; + break; + case 'd': + ch.offset = s - 1; + ch.del_cnt = e - s + 1; + ch.add = NULL; + ch.add_cnt = 0; + ch.add_len = 0; + filechanges.add_change(ch); + break; + } + } else { /* !cmdwaanted */ + if (buffer[0] == '.' && buffer[1] == '\n') { + cmdwanted = true; + filechanges.add_change(ch); + } else { + char *last = NULL; + char *add; + size_t l; + if (ch.add) + last = ch.add + ch.add_len; + l = strlen(buffer); + add = add_text.add_easy(buffer, l, last); + if (!add) { + ch.add_len += l; + ch.add_cnt++; + } else { + if (ch.add) { + filechanges.add_change(ch); + ch.del_cnt = 0; + } + ch.offset += ch.add_cnt; + ch.add = add; + ch.add_len = l; + ch.add_cnt = 1; + } + } + } + } + } + + void write_diff(FILE *f) + { + size_t line = 0; + std::list::reverse_iterator ch; + for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) { + line += ch->offset + ch->del_cnt; + } + + for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) { + std::list::reverse_iterator mg_i, mg_e = ch; + while (ch->del_cnt == 0 && ch->offset == 0) + ch++; + line -= ch->del_cnt; + if (ch->add_cnt > 0) { + if (ch->del_cnt == 0) { + fprintf(f, "%lua\n", line); + } else if (ch->del_cnt == 1) { + fprintf(f, "%luc\n", line+1); + } else { + fprintf(f, "%lu,%luc\n", line+1, line+ch->del_cnt); + } + + mg_i = ch; + do { + dump_mem(f, mg_i->add, mg_i->add_len, NULL); + } while (mg_i-- != mg_e); + + fprintf(f, ".\n"); + } else if (ch->del_cnt == 1) { + fprintf(f, "%lud\n", line+1); + } else if (ch->del_cnt > 1) { + fprintf(f, "%lu,%lud\n", line+1, line+ch->del_cnt); + } + line -= ch->offset; + } + } - To = open(Path.c_str(), O_RDONLY); - Hash.AddFD(To, Buf.st_size); - close(To); + void apply_against_file(FILE *out, FILE *in, Hashes *hash = NULL) + { + std::list::iterator ch; + for (ch = filechanges.begin(); ch != filechanges.end(); ch++) { + dump_lines(out, in, ch->offset, hash); + skip_lines(in, ch->del_cnt); + dump_mem(out, ch->add, ch->add_len, hash); + } + dump_rest(out, in, hash); } +}; + +bool LookupPatches(const std::string &Message, std::vector &lines) +{ + const char *Tag = "Patches"; + const size_t Length = strlen(Tag); + + std::string::const_iterator I, J; + + std::clog << "Looking for \"Patches:\" section in message:\n\n" << Message << "\n\n"; + std::clog.flush(); - /* Transfer the modification times from the patch file - to be able to see in which state the file should be - and use the access time from the "old" file */ - struct stat BufBase, BufPatch; - if (stat(Path.c_str(),&BufBase) != 0 || - stat(lastPatchName.c_str(), &BufPatch) != 0) - return _error->Errno("stat",_("Failed to stat")); - - struct utimbuf TimeBuf; - TimeBuf.actime = BufBase.st_atime; - TimeBuf.modtime = BufPatch.st_mtime; - if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime",_("Failed to set modification time")); - - if (stat(Itm->DestFile.c_str(),&BufBase) != 0) - return _error->Errno("stat",_("Failed to stat")); - - // return done - Res.LastModified = BufBase.st_mtime; - Res.Size = BufBase.st_size; - Res.TakeHashes(Hash); - URIDone(Res); - - return true; + for (I = Message.begin(); I + Length < Message.end(); ++I) + { + if (I[Length] == ':' && stringcasecmp(I, I+Length, Tag) == 0) + { + // found the tag, now read the patches + for(;;) { + for (; I < Message.end() && *I != '\n'; ++I); + if (I < Message.end()) I++; + if (I == Message.end() || *I != ' ') + break; + while (I < Message.end() && isspace(*I)) I++; + for (J = I; J < Message.end() && *J != '\n'; ++J) + ; + do + J--; + while (I < J && isspace(*J)); + if (I < J) + lines.push_back(std::string(I,++J)); + else + break; + I = J; + } + std::clog << "Found " << lines.size() << " patches!\n"; + std::clog.flush(); + return true; + } + } + std::clog << "Found no patches! :(\n"; + std::clog.flush(); + return false; } - /*}}}*/ -/** \brief Wrapper class for testing rred */ /*{{{*/ -class TestRredMethod : public RredMethod { -public: - /** \brief Run rred in debug test mode - * - * This method can be used to run the rred method outside - * of the "normal" acquire environment for easier testing. - * - * \param base basename of all files involved in this rred test - */ - bool Run(char const *base) { - _config->CndSet("Debug::pkgAcquire::RRed", "true"); - FetchItem *test = new FetchItem; - test->DestFile = base; - return Fetch(test); - } + + +class RredMethod : public pkgAcqMethod { + private: + bool Debug; + std::vector patchpaths; + + protected: + virtual bool HandleMessage(int Number, std::string Message) { + if (Number == 600) + { + patchpaths.clear(); + LookupPatches(Message, patchpaths); + std::clog << "Ended up with " << patchpaths.size() << " patches!\n"; + std::clog.flush(); + } + return pkgAcqMethod::HandleMessage(Number, Message); + } + + virtual bool Fetch(FetchItem *Itm) { + Debug = _config->FindB("Debug::pkgAcquire::RRed", false); + URI Get = Itm->Uri; + std::string Path = Get.Host + Get.Path; // rred:/path - no host + + FetchResult Res; + Res.Filename = Itm->DestFile; + if (Itm->Uri.empty()) { + Path = Itm->DestFile; + Itm->DestFile.append(".result"); + } else + URIStart(Res); + + Patch patch; + + if (patchpaths.empty()) + { + patchpaths.push_back(Path + ".ed"); + } + + std::string patch_name; + for (std::vector::iterator I = patchpaths.begin(); + I != patchpaths.end(); + I++) + { + patch_name = *I; + if (Debug == true) + std::clog << "Patching " << Path << " with " << patch_name + << std::endl; + + FILE *p = fopen(patch_name.c_str(), "r"); + if (p == NULL) { + std::clog << "Could not open patch file " << patch_name << std::endl; + abort(); + } + patch.read_diff(p); + fclose(p); + } + + if (Debug == true) + std::clog << "Applying patches against " << Path + << " and writing results to " << Itm->DestFile + << std::endl; + + FILE *inp = fopen(Path.c_str(), "r"); + FILE *out = fopen(Itm->DestFile.c_str(), "w"); + + Hashes hash; + + patch.apply_against_file(out, inp, &hash); + + fclose(out); + fclose(inp); + + if (Debug == true) { + std::clog << "rred: finished file patching of " << Path << "." << std::endl; + } + + struct stat bufbase, bufpatch; + if (stat(Path.c_str(), &bufbase) != 0 || + stat(patch_name.c_str(), &bufpatch) != 0) + return _error->Errno("stat", _("Failed to stat")); + + struct utimbuf timebuf; + timebuf.actime = bufbase.st_atime; + timebuf.modtime = bufpatch.st_mtime; + if (utime(Itm->DestFile.c_str(), &timebuf) != 0) + return _error->Errno("utime", _("Failed to set modification time")); + + if (stat(Itm->DestFile.c_str(), &bufbase) != 0) + return _error->Errno("stat", _("Failed to stat")); + + Res.LastModified = bufbase.st_mtime; + Res.Size = bufbase.st_size; + Res.TakeHashes(hash); + URIDone(Res); + + return true; + } + + public: + RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig) {} }; - /*}}}*/ -/** \brief Starter for the rred method (or its test method) {{{ - * - * Used without parameters is the normal behavior for methods for - * the APT acquire system. While this works great for the acquire system - * it is very hard to test the method and therefore the method also - * accepts one parameter which will switch it directly to debug test mode: - * The test mode expects that if "Testfile" is given as parameter - * the file "Testfile" should be ed-style patched with "Testfile.ed" - * and will write the result to "Testfile.result". - */ -int main(int argc, char *argv[]) { - if (argc <= 1) { - RredMethod Mth; - return Mth.Run(); - } else { - TestRredMethod Mth; - bool result = Mth.Run(argv[1]); - _error->DumpErrors(); - return result; - } + +int main(int argc, char **argv) +{ + int i; + bool just_diff = true; + Patch patch; + + if (argc <= 1) { + RredMethod Mth; + return Mth.Run(); + } + + if (argc > 1 && strcmp(argv[1], "-f") == 0) { + just_diff = false; + i = 2; + } else { + i = 1; + } + + for (; i < argc; i++) { + FILE *p; + p = fopen(argv[i], "r"); + if (!p) { + perror(argv[i]); + exit(1); + } + patch.read_diff(p); + } + + if (just_diff) { + patch.write_diff(stdout); + } else { + FILE *out, *inp; + out = stdout; + inp = stdin; + + patch.apply_against_file(out, inp); + } + return 0; } - /*}}}*/ -- cgit v1.2.3 From 50bd6fd3794dd1f61185302129dc6cd218d20b98 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 15 Jan 2014 17:23:05 +0100 Subject: integrate Anthonys rred with POC for client-side merge Providing the benefits of both without the downsides :) (ABI breaks or external dependencies) For this Anthonys rred is equipped with: - magic-filename-pickup of patches rather than explicit messages - use of FileFd instead of FILE* to get on-the-fly uncompress of the gzip compressed pdiff patches The acquire code in turn stops checking for apt-file's helper as our own rred is now clever enough for our needs. --- apt-pkg/acquire-item.cc | 11 ++--- methods/rred.cc | 94 +++++++++++---------------------------- test/integration/test-pdiff-usage | 23 +++++++--- 3 files changed, 45 insertions(+), 83 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 7f6443555..1185908f3 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -513,14 +513,9 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ bool pdiff_merge = _config->FindB("Acquire::PDiffs::Merge", true); if (pdiff_merge == true) { - // this perl script is provided by apt-file - pdiff_merge = FileExists(_config->FindFile("Dir::Bin::rred", "/usr/bin/diffindex-rred")); - if (pdiff_merge == true) - { - // reprepro adds this flag if it has merged patches on the server - std::string const precedence = Tags.FindS("X-Patch-Precedence"); - pdiff_merge = (precedence != "merged"); - } + // reprepro adds this flag if it has merged patches on the server + std::string const precedence = Tags.FindS("X-Patch-Precedence"); + pdiff_merge = (precedence != "merged"); } if (pdiff_merge == false) diff --git a/methods/rred.cc b/methods/rred.cc index ed3fcc82e..313166160 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -407,13 +407,13 @@ class Patch { public: - void read_diff(FILE *f) + void read_diff(FileFd &f) { char buffer[BLOCK_SIZE]; bool cmdwanted = true; Change ch(0); - while(fgets(buffer, sizeof(buffer), f)) + while(f.ReadLine(buffer, sizeof(buffer))) { if (cmdwanted) { char *m, *c; @@ -534,66 +534,11 @@ class Patch { } }; -bool LookupPatches(const std::string &Message, std::vector &lines) -{ - const char *Tag = "Patches"; - const size_t Length = strlen(Tag); - - std::string::const_iterator I, J; - - std::clog << "Looking for \"Patches:\" section in message:\n\n" << Message << "\n\n"; - std::clog.flush(); - - for (I = Message.begin(); I + Length < Message.end(); ++I) - { - if (I[Length] == ':' && stringcasecmp(I, I+Length, Tag) == 0) - { - // found the tag, now read the patches - for(;;) { - for (; I < Message.end() && *I != '\n'; ++I); - if (I < Message.end()) I++; - if (I == Message.end() || *I != ' ') - break; - while (I < Message.end() && isspace(*I)) I++; - for (J = I; J < Message.end() && *J != '\n'; ++J) - ; - do - J--; - while (I < J && isspace(*J)); - if (I < J) - lines.push_back(std::string(I,++J)); - else - break; - I = J; - } - std::clog << "Found " << lines.size() << " patches!\n"; - std::clog.flush(); - return true; - } - } - std::clog << "Found no patches! :(\n"; - std::clog.flush(); - return false; -} - - class RredMethod : public pkgAcqMethod { private: bool Debug; - std::vector patchpaths; protected: - virtual bool HandleMessage(int Number, std::string Message) { - if (Number == 600) - { - patchpaths.clear(); - LookupPatches(Message, patchpaths); - std::clog << "Ended up with " << patchpaths.size() << " patches!\n"; - std::clog.flush(); - } - return pkgAcqMethod::HandleMessage(Number, Message); - } - virtual bool Fetch(FetchItem *Itm) { Debug = _config->FindB("Debug::pkgAcquire::RRed", false); URI Get = Itm->Uri; @@ -601,17 +546,29 @@ class RredMethod : public pkgAcqMethod { FetchResult Res; Res.Filename = Itm->DestFile; - if (Itm->Uri.empty()) { + if (Itm->Uri.empty()) + { Path = Itm->DestFile; Itm->DestFile.append(".result"); } else URIStart(Res); + std::vector patchpaths; Patch patch; - if (patchpaths.empty()) - { + if (FileExists(Path + ".ed") == true) patchpaths.push_back(Path + ".ed"); + else + { + _error->PushToStack(); + std::vector patches = GetListOfFilesInDir(flNotFile(Path), "gz", true, false); + _error->RevertToStack(); + + std::string const baseName = Path + ".ed."; + for (std::vector::const_iterator p = patches.begin(); + p != patches.end(); ++p) + if (p->compare(0, baseName.length(), baseName) == 0) + patchpaths.push_back(*p); } std::string patch_name; @@ -624,13 +581,15 @@ class RredMethod : public pkgAcqMethod { std::clog << "Patching " << Path << " with " << patch_name << std::endl; - FILE *p = fopen(patch_name.c_str(), "r"); - if (p == NULL) { - std::clog << "Could not open patch file " << patch_name << std::endl; + FileFd p; + // all patches are compressed, even if the name doesn't reflect it + if (p.Open(patch_name, FileFd::ReadOnly, FileFd::Gzip) == false) { + std::cerr << "Could not open patch file " << patch_name << std::endl; + _error->DumpErrors(std::cerr); abort(); } patch.read_diff(p); - fclose(p); + p.Close(); } if (Debug == true) @@ -697,10 +656,9 @@ int main(int argc, char **argv) } for (; i < argc; i++) { - FILE *p; - p = fopen(argv[i], "r"); - if (!p) { - perror(argv[i]); + FileFd p; + if (p.Open(argv[i], FileFd::ReadOnly) == false) { + _error->DumpErrors(std::cerr); exit(1); } patch.read_diff(p); diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 5a06e0ccb..ad31511b9 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -20,10 +20,19 @@ chmod +x extrred echo 'Dir::Bin::rred "./extrred";' > rootdir/etc/apt/apt.conf.d/99rred wasmergeused() { - testsuccess aptget update "$@" + msgtest 'Test for successful execution of' "$*" + local OUTPUT=$(mktemp) + addtrap "rm $OUTPUT;" + if aptget update "$@" >${OUTPUT} 2>&1; then + msgpass + else + echo + cat $OUTPUT + msgfail + fi + msgtest 'Check if the right pdiff merger was used' - if [ -e ./merge-was-used ]; then - rm -f ./merge-was-used + if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' $OUTPUT; then if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then msgpass else @@ -50,7 +59,7 @@ testrun() { testequal "$(cat ${PKGFILE}) " aptcache show apt oldstuff - # apply with one patch + msgmsg 'Testcase: apply with one patch' cp ${PKGFILE}-new aptarchive/Packages compressfile 'aptarchive/Packages' mkdir -p aptarchive/Packages.diff @@ -73,13 +82,13 @@ SHA1-Patches: testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - # index is already up-to-date + msgmsg 'Testcase: index is already up-to-date' find rootdir/var/lib/apt/lists -name '*.IndexDiff' -type f -delete testsuccess aptget update "$@" testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - # apply with two patches + msgmsg 'Testcase: apply with two patches' cp ${PKGFILE}-new aptarchive/Packages echo ' Package: futurestuff @@ -120,7 +129,7 @@ SHA1-Patches: testequal "$(cat Packages-future) " aptcache show apt newstuff futurestuff - # patch applying fails, but successful fallback + msgmsg 'Testcase: patch applying fails, but successful fallback' rm -rf rootdir/var/lib/apt/lists cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists cp ${PKGFILE}-new aptarchive/Packages -- cgit v1.2.3 From f74a6fa120759d0a1bd4a5aff0dc2c50911b5407 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 15 Jan 2014 18:44:47 +0100 Subject: rework some testcases to not spit out text Rework also uncovers two FIXMEs Git-Dch: Ignore --- test/integration/framework | 22 ++++---- test/integration/test-apt-progress-fd-conffile | 17 +++++-- test/integration/test-apt-sources-deb822 | 70 ++++++++++++++------------ test/integration/test-bug-728500-tempdir | 19 +++++-- 4 files changed, 77 insertions(+), 51 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 6ada1e9cc..2fe059280 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -948,22 +948,22 @@ testempty() { test -z "$($* 2>&1)" && msgpass || msgfail } -testequalwithmsg() { - local MSG="$1" - shift +testequal() { + local MSG='Test of equality of' + if [ "$1" = '--nomsg' ]; then + MSG='' + shift + fi + local COMPAREFILE=$(mktemp) addtrap "rm $COMPAREFILE;" echo "$1" > $COMPAREFILE shift - msgtest "$MSG" - $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail -} -testequal() { - local EXPECTED="$1" - shift - local MSG="Test for equality of $*" - testequalwithmsg "$MSG" "$EXPECTED" $* + if [ -n "$MSG" ]; then + msgtest "$MSG" "$*" + fi + $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail } testequalor2() { diff --git a/test/integration/test-apt-progress-fd-conffile b/test/integration/test-apt-progress-fd-conffile index 0b42b1b2f..085d5e871 100755 --- a/test/integration/test-apt-progress-fd-conffile +++ b/test/integration/test-apt-progress-fd-conffile @@ -32,12 +32,19 @@ testsuccess aptget install compiz-core=1.0 # fake conffile change echo "meep" >> rootdir/etc/compiz.conf/compiz.conf -# install +# FIXME: Is there really no way to see if dpkg actually prompts? +msgtest 'Test for successful execution of' 'apt-get install compiz-core=2.0' +OUTPUT=$(mktemp) +addtrap "rm $OUTPUT;" exec 3> apt-progress.log -echo n | aptget install compiz-core=2.0 -o APT::Status-Fd=3 -o Dpkg::Use-Pty=false +if aptget install compiz-core=2.0 -o APT::Status-Fd=3 -o Dpkg::Use-Pty=false -o dpkg::options::='--force-confold' >${OUTPUT} 2>&1; then + msgpass +else + echo + cat $OUTPUT + msgfail +fi # and ensure there is a conffile message in the file -msgtest "Conffile prompt in apt-progress.log" +msgtest 'Test status fd for an included' 'pmconffile msg' grep -q "pmconffile:/etc/compiz.conf/compiz.conf" apt-progress.log && msgpass || (cat apt-progress.log && msgfail) - -cat apt-progress.log \ No newline at end of file diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index bacad1ed4..8c022767f 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -5,17 +5,10 @@ TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture "i386" +configarchitecture 'i386' -SOURCES="rootdir/etc/apt/sources.list" - -echo "deb http://ftp.debian.org/debian stable main" > $SOURCES -testequalwithmsg "Old style sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : -'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris - - -BASE="# some comment +SOURCES='rootdir/etc/apt/sources.list' +BASE='# some comment # that contains a : as well #Type: meep @@ -24,57 +17,72 @@ URL: http://ftp.debian.org/debian Dist: stable Section: main Comment: Some random string - that can be very long" + that can be very long' -# simple case -echo "$BASE" > $SOURCES -testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +msgtest 'Test old-style sources.list' +echo "deb http://ftp.debian.org/debian stable main" > $SOURCES +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : -'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris -# two sections (we support both "," and " " as seperator) -echo "$BASE" | sed s/main/"main,contrib"/ > $SOURCES +msgtest 'Test simple deb822 sources.list' +echo "$BASE" > $SOURCES +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris -testequalwithmsg "Two sections deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : + +msgtest 'Test deb822 with two sections' 'seperated by comma' +echo "$BASE" | sed 's/main/main,contrib/' > $SOURCES +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : -'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + +# FIXME: Advertised, but not supported at the moment +#msgtest 'Test deb822 with two sections' 'seperated by space' +#echo "$BASE" | sed 's/main/main contrib/' > $SOURCES +#testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +#'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 : +#'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 : +#'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +#'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris -# Two entries + +msgtest 'Test deb822 with' 'two entries' echo "$BASE" > $SOURCES echo "" >> $SOURCES echo "$BASE" | sed s/stable/unstable/ >> $SOURCES - -testequalwithmsg "Multiple entries in deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 : -'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris +'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris -# ARCH option +msgtest 'Test deb822' 'architecture option' echo "$BASE" > $SOURCES echo "Arch: amd64,armel" >> $SOURCES - -testequalwithmsg "Arch: option in deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris -# invalid sources.list file -echo "deb http://ftp.debian.org" > $SOURCES -testequalwithmsg "Invalid sources.list file gives proper error" "E: Malformed line 1 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (dist) +msgtest 'Test old-style sources.list file which has' 'malformed dist' +echo "deb http://ftp.debian.org" > $SOURCES +testequal --nomsg "E: Malformed line 1 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (dist) E: The list of sources could not be read." aptget update --print-uris + +msgtest 'Test deb822 sources.list file which has' 'malformed URI' echo "Type: deb Dist: stable " > $SOURCES - -testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse) +testequal --nomsg "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse) E: The list of sources could not be read." aptget update --print-uris diff --git a/test/integration/test-bug-728500-tempdir b/test/integration/test-bug-728500-tempdir index 0606538a1..0451fc1ed 100755 --- a/test/integration/test-bug-728500-tempdir +++ b/test/integration/test-bug-728500-tempdir @@ -7,12 +7,23 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture 'i386' -buildsimplenativepackage 'coolstuff' 'all' '1.0' 'unstable' +insertpackage 'unstable' 'coolstuff' 'all' '1.0' setupaptarchive changetowebserver -msgtest 'Test with incorect TMPDIR' +msgtest 'Test apt-get update with incorrect' 'TMPDIR' + +OUTPUT=$(mktemp) +addtrap "rm $OUTPUT;" export TMPDIR=/does-not-exists -aptget update && msgpass || msgfail -unset TMPDIR \ No newline at end of file +if aptget update >${OUTPUT} 2>&1; then + msgpass +else + echo + cat $OUTPUT + msgfail +fi +unset TMPDIR + +testequal 'coolstuff' aptcache pkgnames -- cgit v1.2.3 From db6594dfc508378b6d658aff2761da5406404238 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 08:03:24 +0100 Subject: remove "," in components again --- apt-pkg/sourcelist.cc | 6 +----- test/integration/test-apt-sources-deb822 | 11 ----------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 5e4a58e95..42ada7e18 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -363,11 +363,7 @@ int pkgSourceList::ParseFileDeb822(string File) // now create one item per section string const Section = Tags.FindS("Section"); - std::vector list; - if (Section.find(",")) - list = StringSplit(Section, ","); - else - list = StringSplit(Section, " "); + std::vector list = StringSplit(Section, " "); for (std::vector::const_iterator I = list.begin(); I != list.end(); I++) Parse->CreateItem(SrcList, URI, Dist, (*I), Options); diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index bacad1ed4..b110c1462 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -33,17 +33,6 @@ testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debi 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris - -# two sections (we support both "," and " " as seperator) -echo "$BASE" | sed s/main/"main,contrib"/ > $SOURCES - -testequalwithmsg "Two sections deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : -'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris - - # Two entries echo "$BASE" > $SOURCES echo "" >> $SOURCES -- cgit v1.2.3 From 3bdf7da5b40636376699aa8a976aae1b279ef356 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 16:45:11 +0100 Subject: add --manual-installed commandline switch --- apt-private/private-cacheset.cc | 9 +++++++++ apt-private/private-cmndline.cc | 1 + 2 files changed, 10 insertions(+) diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc index 6fb224010..a7dc0e800 100644 --- a/apt-private/private-cacheset.cc +++ b/apt-private/private-cacheset.cc @@ -52,6 +52,15 @@ bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, output_set.insert(policy->GetCandidateVer(P)); } } + else if (_config->FindB("APT::Cmd::Manual-Installed") == true) + { + if (P.CurrentVer() && + ((*DepCache)[P].Flags & pkgCache::Flag::Auto) == false) + { + pkgPolicy *policy = CacheFile.GetPolicy(); + output_set.insert(policy->GetCandidateVer(P)); + } + } else { pkgPolicy *policy = CacheFile.GetPolicy(); diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 28309af07..d6d7bca64 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -226,6 +226,7 @@ bool addArgumentsAPT(std::vector &Args, char const * const Cm { addArg(0,"installed","APT::Cmd::Installed",0); addArg(0,"upgradable","APT::Cmd::Upgradable",0); + addArg(0,"manual-installed","APT::Cmd::Manual-Installed",0); addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0); addArg('a', "all-versions", "APT::Cmd::All-Versions", 0); } -- cgit v1.2.3 From 7037aab52fc935298b033a4c7ba7ccb5b697622e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 16:25:33 +0100 Subject: * refactor to have a new virtual ParseStanza Have a similar ParseStanza() to the current ParseLine(). Rename the Architectures options in deb822 to make it more user friendly --- apt-pkg/sourcelist.cc | 65 +++++++++++++++++++------------- apt-pkg/sourcelist.h | 5 +++ test/integration/test-apt-sources-deb822 | 2 +- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 42ada7e18..fe0eace07 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -71,6 +71,44 @@ bool pkgSourceList::Type::FixupURI(string &URI) const return true; } /*}}}*/ +bool pkgSourceList::Type::ParseStanza(vector &List, + pkgTagSection &Tags, + int i, + FileFd &Fd) +{ + map Options; + + string URI = Tags.FindS("URL"); + if (!FixupURI(URI)) + { + _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); + return false; + } + + string Dist = Tags.FindS("Dist"); + Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); + + // Define external/internal options + const char* option_deb822[] = { + "Architectures", "Architectures-Add", "Architectures-Delete", "Trusted", + }; + const char* option_internal[] = { + "arch", "arch+", "arch-", "trusted", + }; + for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++) + if (Tags.Exists(option_deb822[j])) + Options[option_internal[j]] = Tags.FindS(option_deb822[j]); + + // now create one item per section + string const Section = Tags.FindS("Section"); + std::vector list = StringSplit(Section, " "); + for (std::vector::const_iterator I = list.begin(); + I != list.end(); I++) + return CreateItem(List, URI, Dist, (*I), Options); + + return true; +} + // Type::ParseLine - Parse a single line /*{{{*/ // --------------------------------------------------------------------- /* This is a generic one that is the 'usual' format for sources.list @@ -313,7 +351,6 @@ bool pkgSourceList::ParseFileOldStyle(string File) int pkgSourceList::ParseFileDeb822(string File) { pkgTagSection Tags; - map Options; unsigned int i=0; // see if we can read the file @@ -338,35 +375,11 @@ int pkgSourceList::ParseFileDeb822(string File) if (Parse == 0) { _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); - // true means we do not retry with old-style sources.list return -1; } - string URI = Tags.FindS("URL"); - if (!Parse->FixupURI(URI)) - { - _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); - // means we do not retry with old-style sources.list + if (!Parse->ParseStanza(SrcList, Tags, i, Fd)) return -1; - } - - string Dist = Tags.FindS("Dist"); - Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); - - // check if there are any options we support - const char* option_str[] = { - "arch", "arch+", "arch-", "trusted", - }; - for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++) - if (Tags.Exists(option_str[j])) - Options[option_str[j]] = Tags.FindS(option_str[j]); - - // now create one item per section - string const Section = Tags.FindS("Section"); - std::vector list = StringSplit(Section, " "); - for (std::vector::const_iterator I = list.begin(); - I != list.end(); I++) - Parse->CreateItem(SrcList, URI, Dist, (*I), Options); i++; } diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index d83c76d6a..0ccb4aa00 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -31,6 +31,7 @@ #include #include #include +#include #ifndef APT_8_CLEANER_HEADERS #include @@ -60,6 +61,10 @@ class pkgSourceList const char *Label; bool FixupURI(std::string &URI) const; + virtual bool ParseStanza(std::vector &List, + pkgTagSection &Tags, + int stanza_n, + FileFd &Fd); virtual bool ParseLine(std::vector &List, const char *Buffer, unsigned long const &CurLine,std::string const &File) const; diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index b110c1462..fcb6010c3 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -48,7 +48,7 @@ testequalwithmsg "Multiple entries in deb822 sources.list work" "'http://ftp.deb # ARCH option echo "$BASE" > $SOURCES -echo "Arch: amd64,armel" >> $SOURCES +echo "Architectures: amd64,armel" >> $SOURCES testequalwithmsg "Arch: option in deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : -- cgit v1.2.3 From 796a0eff1acebe858632c344e77bfc3189b2244f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 17:00:56 +0100 Subject: rename "distribution" in sources.list to "suite" --- apt-pkg/sourcelist.cc | 2 +- doc/sources.list.5.xml | 38 +++++++++++++++++--------------- test/integration/test-apt-sources-deb822 | 4 ++-- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index fe0eace07..ddebd206d 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -85,7 +85,7 @@ bool pkgSourceList::Type::ParseStanza(vector &List, return false; } - string Dist = Tags.FindS("Dist"); + string Dist = Tags.FindS("Suite"); Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); // Define external/internal options diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index ef5219ec2..7a82bd4ce 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -79,19 +79,19 @@ The format for a sources.list entry using the deb and deb-src types is: - deb [ options ] uri distribution [component1] [component2] [...] + deb [ options ] uri suite [component1] [component2] [...] Alternatively a rfc822 style format is also supported: Type: deb URI: http://example.com - Dist: stable + Suite: stable Section: component1 component2 [option1]: [option1-value] Type: deb-src URI: http://example.com - Dist: stable + Suite: stable Section: component1 component2 [option1]: [option1-value] @@ -99,14 +99,14 @@ The URI for the deb type must specify the base of the Debian distribution, from which APT will find the information it needs. - distribution can specify an exact path, in which case the - components must be omitted and distribution must end with + suite can specify an exact path, in which case the + components must be omitted and suite must end with a slash (/). This is useful for the case when only a particular sub-section of the archive denoted by the URI is of interest. - If distribution does not specify an exact path, at least + If suite does not specify an exact path, at least one component must be present. - distribution may also contain a variable, + suite may also contain a variable, $(ARCH) which expands to the Debian architecture (such as amd64 or armel) used on the system. This permits architecture-independent @@ -114,17 +114,19 @@ of interest when specifying an exact path, APT will automatically generate a URI with the current architecture otherwise. - Since only one distribution can be specified per line it may be necessary - to have multiple lines for the same URI, if a subset of all available - distributions or components at that location is desired. - APT will sort the URI list after it has generated a complete set - internally, and will collapse multiple references to the same Internet - host, for instance, into a single connection, so that it does not - inefficiently establish an FTP connection, close it, do something else, - and then re-establish a connection to that same host. This feature is - useful for accessing busy FTP sites with limits on the number of - simultaneous anonymous users. APT also parallelizes connections to - different hosts to more effectively deal with sites with low bandwidth. + In the traditional style sources.list format since only one + distribution can be specified per line it may be necessary to have + multiple lines for the same URI, if a subset of all available + distributions or components at that location is desired. APT will + sort the URI list after it has generated a complete set internally, + and will collapse multiple references to the same Internet host, + for instance, into a single connection, so that it does not + inefficiently establish an FTP connection, close it, do something + else, and then re-establish a connection to that same host. This + feature is useful for accessing busy FTP sites with limits on the + number of simultaneous anonymous users. APT also parallelizes + connections to different hosts to more effectively deal with sites + with low bandwidth. options is always optional and needs to be surrounded by square brackets. It can consist of multiple settings in the form diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index fcb6010c3..00ca102be 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -21,7 +21,7 @@ BASE="# some comment Type: deb URL: http://ftp.debian.org/debian -Dist: stable +Suite: stable Section: main Comment: Some random string that can be very long" @@ -62,7 +62,7 @@ testequalwithmsg "Invalid sources.list file gives proper error" "E: Malformed li E: The list of sources could not be read." aptget update --print-uris echo "Type: deb -Dist: stable +Suite: stable " > $SOURCES testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse) -- cgit v1.2.3 From a51fa92c521a6790446108a54ad1d9b6a16515ff Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 17:03:07 +0100 Subject: rename URL to Uri in deb822-sources --- apt-pkg/sourcelist.cc | 2 +- doc/sources.list.5.xml | 4 ++-- test/integration/test-apt-sources-deb822 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index ddebd206d..0cea8dc7f 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -78,7 +78,7 @@ bool pkgSourceList::Type::ParseStanza(vector &List, { map Options; - string URI = Tags.FindS("URL"); + string URI = Tags.FindS("Uri"); if (!FixupURI(URI)) { _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 7a82bd4ce..e770023d5 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -84,13 +84,13 @@ Alternatively a rfc822 style format is also supported: Type: deb - URI: http://example.com + Uri: http://example.com Suite: stable Section: component1 component2 [option1]: [option1-value] Type: deb-src - URI: http://example.com + Uri: http://example.com Suite: stable Section: component1 component2 [option1]: [option1-value] diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 00ca102be..edf52487c 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -20,7 +20,7 @@ BASE="# some comment #Type: meep Type: deb -URL: http://ftp.debian.org/debian +Uri: http://ftp.debian.org/debian Suite: stable Section: main Comment: Some random string -- cgit v1.2.3 From d73743ddae1228bcd409700d8d0ffbe26e2e6cd1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 17:13:18 +0100 Subject: support multiple "Suite:" entries --- apt-pkg/sourcelist.cc | 27 ++++++++++++++++++--------- test/integration/test-apt-sources-deb822 | 8 ++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 0cea8dc7f..09d8287a0 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -85,9 +85,6 @@ bool pkgSourceList::Type::ParseStanza(vector &List, return false; } - string Dist = Tags.FindS("Suite"); - Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); - // Define external/internal options const char* option_deb822[] = { "Architectures", "Architectures-Add", "Architectures-Delete", "Trusted", @@ -99,13 +96,25 @@ bool pkgSourceList::Type::ParseStanza(vector &List, if (Tags.Exists(option_deb822[j])) Options[option_internal[j]] = Tags.FindS(option_deb822[j]); - // now create one item per section + // now create one item per suite/section + string Suite = Tags.FindS("Suite"); + Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture")); string const Section = Tags.FindS("Section"); - std::vector list = StringSplit(Section, " "); - for (std::vector::const_iterator I = list.begin(); - I != list.end(); I++) - return CreateItem(List, URI, Dist, (*I), Options); - + + std::vector list_dist = StringSplit(Suite, " "); + std::vector list_section = StringSplit(Section, " "); + for (std::vector::const_iterator I = list_dist.begin(); + I != list_dist.end(); I++) + { + for (std::vector::const_iterator J = list_section.begin(); + J != list_section.end(); J++) + { + if (CreateItem(List, URI, (*I), (*J), Options) == false) + { + return false; + } + } + } return true; } diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index edf52487c..67d119565 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -45,6 +45,14 @@ testequalwithmsg "Multiple entries in deb822 sources.list work" "'http://ftp.deb 'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris +# two suite entries +echo "$BASE" | sed -e "s/stable/stable unstable/" > $SOURCES +testequalwithmsg "Two Suite entries deb822 sources.list work" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 +'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris # ARCH option echo "$BASE" > $SOURCES -- cgit v1.2.3 From bee0670b2dc8c50ddfc65731c00383da4d377cae Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 16 Jan 2014 17:21:13 +0100 Subject: show the error message if the webserver start failed Can happen e.g. if port 8080 is already used by something else Git-Dch: Ignore --- test/integration/framework | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 60a8167fa..c4953812b 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -835,10 +835,14 @@ changetowebserver() { else shift fi - local LOG='/dev/null' if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then cd aptarchive - aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 + local LOG="$(mktemp)" + addtrap "rm $LOG;" + if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then + cat $LOG + false + fi local PID="$(cat aptwebserver.pid)" if [ -z "$PID" ]; then msgdie 'Could not fork aptwebserver successfully' -- cgit v1.2.3 From 78766f46d043c1c1eeb9869db7e1c5b4093d5274 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 18:14:14 +0100 Subject: update libapt test --- test/libapt/sourcelist_test.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 6e83d08e0..1d30bd85b 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -23,15 +23,15 @@ int main(int argc, char *argv[]) { const char contents[] = "" "Type: deb\n" - "URL: http://ftp.debian.org/debian\n" - "Dist: stable\n" + "Uri: http://ftp.debian.org/debian\n" + "Suite: stable\n" "Section: main\n" "Comment: Some random string\n" " that can be very long\n" "\n" "Type: deb\n" - "URL: http://ftp.debian.org/debian\n" - "Dist: unstable\n" + "Uri: http://ftp.debian.org/debian\n" + "Suite: unstable\n" "Section: main non-free\n" ; -- cgit v1.2.3 From 2a79257e96010318c4bc6d2f2e3e9c475e5bf445 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 18:26:07 +0100 Subject: apt-private/private-show.cc: do not show Description-lang: header, the user probably knows his language (thanks to Donkult) --- apt-private/private-show.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index ddc75dbeb..0aa42ecce 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -74,13 +74,12 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, // write the description pkgRecords Recs(*Cache); + // FIXME: show (optionally) all available translations(?) pkgCache::DescIterator Desc = V.TranslatedDescription(); if (Desc.end() == false) { pkgRecords::Parser &P = Recs.Lookup(Desc.FileList()); - if (strcmp(Desc.LanguageCode(),"") != 0) - out << "Description-lang: " << Desc.LanguageCode() << std::endl; - out << "Description" << P.LongDesc(); + out << "Description: " << P.LongDesc(); } // write a final newline (after the description) -- cgit v1.2.3 From 15b6fc7e20e2d097982f50df89fcae71ffc61480 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 18:55:13 +0100 Subject: prepare new upload --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index e1b545949..b4e68e23f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +apt (0.9.14.3~exp2) experimental; urgency=medium + + [ Julian Andres Klode ] + * debian/rules: Call dh_makeshlibs for 'apt' + + [ Anthony Towns ] + * reimplement rred to allow applying all the diffs in a single pass + * correct IndexDiff vs DiffIndex in Debug output + + [ David Kalnischkies ] + * reenable unlimited pdiff files download + * integrate Anthonys rred with POC for client-side merge + + -- Michael Vogt Thu, 16 Jan 2014 18:54:53 +0100 + apt (0.9.14.3~exp1) experimental; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 62d8a765b9b37354efab6ca838cbdb7f347f7cac Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 16 Jan 2014 19:51:23 +0100 Subject: rework some code to fix some scan-build warnings No visible functional changes, just code moved around and additional checks to eliminate impossible branches Reported-By: scan-build Git-Dch: Ignore --- apt-pkg/aptconfiguration.cc | 4 +-- apt-pkg/cacheset.cc | 2 ++ apt-pkg/contrib/gpgv.cc | 6 ++--- apt-pkg/contrib/mmap.cc | 8 +++++- ftparchive/contents.cc | 2 +- ftparchive/override.cc | 56 +++++++++++++++++++--------------------- test/libapt/parsedepends_test.cc | 2 +- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 115d11616..1ebcf97bc 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -141,7 +141,7 @@ std::vector const Configuration::getLanguages(bool const &All, // so they will be all included in the Cache. std::vector builtin; DIR *D = opendir(_config->FindDir("Dir::State::lists").c_str()); - if (D != 0) { + if (D != NULL) { builtin.push_back("none"); for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { string const name = SubstVar(Ent->d_name, "%5f", "_"); @@ -166,8 +166,8 @@ std::vector const Configuration::getLanguages(bool const &All, continue; builtin.push_back(c); } + closedir(D); } - closedir(D); // FIXME: Remove support for the old APT::Acquire::Translation // it was undocumented and so it should be not very widthly used diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 0147f7e86..29281aab9 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -73,6 +73,8 @@ bool PackageContainerInterface::FromTask(PackageContainerInterface * const pci, const char *start, *end; parser.GetRec(start,end); unsigned int const length = end - start; + if (unlikely(length == 0)) + continue; char buf[length]; strncpy(buf, start, length); buf[length-1] = '\0'; diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index f57a72d86..0a469dd7a 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -103,12 +103,12 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } } + enum { DETACHED, CLEARSIGNED } releaseSignature = (FileGPG != File) ? DETACHED : CLEARSIGNED; std::vector dataHeader; char * sig = NULL; char * data = NULL; - // file with detached signature - if (FileGPG != File) + if (releaseSignature == DETACHED) { Args.push_back(FileGPG.c_str()); Args.push_back(File.c_str()); @@ -181,7 +181,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, putenv((char *)"LC_MESSAGES="); } - if (FileGPG != File) + if (releaseSignature == DETACHED) { execvp(gpgvpath.c_str(), (char **) &Args[0]); ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str()); diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index a176da636..51e8eb30f 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -352,6 +352,12 @@ unsigned long DynamicMMap::RawAllocate(unsigned long long Size,unsigned long Aln size in the file. */ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) { + if (unlikely(ItemSize == 0)) + { + _error->Fatal("Can't allocate an item of size zero"); + return 0; + } + // Look for a matching pool entry Pool *I; Pool *Empty = 0; @@ -412,7 +418,7 @@ unsigned long DynamicMMap::WriteString(const char *String, unsigned long const Result = RawAllocate(Len+1,0); - if (Result == 0 && _error->PendingError()) + if (Base == NULL || (Result == 0 && _error->PendingError())) return 0; memcpy((char *)Base + Result,String,Len); diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 015c790e0..80fe6e17e 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -233,7 +233,7 @@ void GenContents::Add(const char *Dir,const char *Package) // The final component if it does not have a trailing / if (I - Start >= 1) - Root = Grab(Root,Start,Package); + Grab(Root,Start,Package); } /*}}}*/ // GenContents::WriteSpace - Write a given number of white space chars /*{{{*/ diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 1288ff133..d2130db8a 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -52,45 +52,41 @@ bool Override::ReadOverride(string const &File,bool const &Source) if (*Pkg == 0) continue; +#define APT_FIND_NEXT_FIELD \ + for (End++; isspace(*End) != 0 && *End != 0; ++End) \ + /* skip spaces */ ; \ + Start = End; \ + for (; isspace(*End) == 0 && *End != 0; ++End) \ + /* find end of word */ ; + +#define APT_WARNING_MALFORMED_LINE(FIELD) \ + if (*End == 0) \ + { \ + _error->Warning(_("Malformed override %s line %llu (%s)"),File.c_str(), \ + Counter, FIELD ); \ + continue; \ + } \ + *End = 0; + // Find the package and zero.. - char *Start = Pkg; + char *Start; char *End = Pkg; for (; isspace(*End) == 0 && *End != 0; End++); - if (*End == 0) - { - _error->Warning(_("Malformed override %s line %llu #1"),File.c_str(), - Counter); - continue; - } - *End = 0; + APT_WARNING_MALFORMED_LINE("pkgname"); + + APT_FIND_NEXT_FIELD; // Find the priority if (Source == false) { - for (End++; isspace(*End) != 0 && *End != 0; End++); - Start = End; - for (; isspace(*End) == 0 && *End != 0; End++); - if (*End == 0) - { - _error->Warning(_("Malformed override %s line %llu #2"),File.c_str(), - Counter); - continue; - } - *End = 0; + APT_WARNING_MALFORMED_LINE("priority"); Itm.Priority = Start; + + APT_FIND_NEXT_FIELD; } - + // Find the Section - for (End++; isspace(*End) != 0 && *End != 0; End++); - Start = End; - for (; isspace(*End) == 0 && *End != 0; End++); - if (*End == 0) - { - _error->Warning(_("Malformed override %s line %llu #3"),File.c_str(), - Counter); - continue; - } - *End = 0; + APT_WARNING_MALFORMED_LINE("section"); Itm.FieldOverride["Section"] = Start; // Source override files only have the two columns @@ -99,7 +95,7 @@ bool Override::ReadOverride(string const &File,bool const &Source) Mapping[Pkg] = Itm; continue; } - + // Find the => for (End++; isspace(*End) != 0 && *End != 0; End++); if (*End != 0) diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index 677b1c892..e95016240 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -176,7 +176,7 @@ test: equals("7.15.3~", Version); equals(Null | pkgCache::Dep::Equals | pkgCache::Dep::Or, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); if (StripMultiArch == true) equals("overlord-dev", Package); else -- cgit v1.2.3 From ea62d40da6b402ff8d4d346971b98e24f096e521 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 21:47:28 +0100 Subject: prepare upload --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b4e68e23f..0df4157fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,14 @@ apt (0.9.14.3~exp2) experimental; urgency=medium * reenable unlimited pdiff files download * integrate Anthonys rred with POC for client-side merge - -- Michael Vogt Thu, 16 Jan 2014 18:54:53 +0100 + [ Michael Vogt ] + * document deb822 style sources.list in sources.list(5) + * rename "Dist:" in deb822 style sources.list to "Suite:" + * rename URL to Uri in deb822-sources + * support multiple "Suite:" entries in deb822 style sources.list: + "Suite: stable testing unstable" + + -- Michael Vogt Thu, 16 Jan 2014 21:43:22 +0100 apt (0.9.14.3~exp1) experimental; urgency=low -- cgit v1.2.3 From 9ce3cfc9309c55cc01018c88c1ca82779fd74431 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 16 Jan 2014 22:19:49 +0100 Subject: correct some style/performance/warnings from cppcheck The most "visible" change is from utime to utimensat/futimens as the first one isn't part of POSIX anymore. Reported-By: cppcheck Git-Dch: Ignore --- apt-inst/dirstream.cc | 20 +++++++--------- apt-pkg/contrib/fileutl.cc | 2 +- apt-pkg/contrib/gpgv.cc | 5 ++-- apt-pkg/contrib/hashes.cc | 5 ++-- apt-pkg/contrib/hashsum.cc | 7 +++--- apt-pkg/deb/dpkgpm.cc | 9 +++---- apt-pkg/install-progress.cc | 2 +- apt-private/private-list.cc | 12 +++++----- apt-private/private-search.cc | 8 +++---- ftparchive/multicompress.cc | 10 ++++---- methods/connect.cc | 6 ++--- methods/copy.cc | 18 +++++++------- methods/ftp.cc | 49 +++++++++++++++++++++------------------ methods/gzip.cc | 26 +++++++++++---------- methods/http.cc | 4 +--- methods/https.cc | 10 ++++---- methods/https.h | 2 +- methods/mirror.cc | 8 +++---- methods/rsh.cc | 36 ++++++++++++++-------------- methods/server.cc | 25 ++++++++++---------- methods/server.h | 2 +- test/interactive-helper/rpmver.cc | 9 ++++--- 22 files changed, 133 insertions(+), 142 deletions(-) diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index 65d1aa188..b62bdcae1 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include /*}}}*/ @@ -93,19 +92,18 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd) { if (Fd < 0) return true; - - if (close(Fd) != 0) - return _error->Errno("close",_("Failed to close file %s"),Itm.Name); /* Set the modification times. The only way it can fail is if someone has futzed with our file, which is intolerable :> */ - struct utimbuf Time; - Time.actime = Itm.MTime; - Time.modtime = Itm.MTime; - if (utime(Itm.Name,&Time) != 0) - _error->Errno("utime",_("Failed to close file %s"),Itm.Name); - - return true; + struct timespec times[2]; + times[0].tv_sec = times[1].tv_sec = Itm.MTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + if (futimens(Fd, times) != 0) + _error->Errno("futimens", "Failed to set modification time for %s",Itm.Name); + + if (close(Fd) != 0) + return _error->Errno("close",_("Failed to close file %s"),Itm.Name); + return true; } /*}}}*/ // DirStream::Fail - Failed processing a file /*{{{*/ diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index efbf7aaf4..1c8acd513 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -319,7 +319,7 @@ bool CreateDirectory(string const &Parent, string const &Path) return false; // we are not going to create directories "into the blue" - if (Path.find(Parent, 0) != 0) + if (Path.compare(0, Parent.length(), Parent) != 0) return false; vector const dirs = VectorizeString(Path.substr(Parent.size()), '/'); diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 0a469dd7a..9de227062 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -260,8 +260,7 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, char *buf = NULL; size_t buf_size = 0; - ssize_t line_len = 0; - while ((line_len = getline(&buf, &buf_size, in)) != -1) + while (getline(&buf, &buf_size, in) != -1) { _strrstrip(buf); if (found_message_start == false) @@ -355,7 +354,7 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me return _error->Error("Couldn't open temporary file to work with %s", ClearSignedFileName.c_str()); _error->PushToStack(); - bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), &MessageFile, NULL, NULL); + bool const splitDone = SplitClearSignedFile(ClearSignedFileName, &MessageFile, NULL, NULL); bool const errorDone = _error->PendingError(); _error->MergeWithStack(); if (splitDone == false) diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index b4c768db9..890573d9c 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -129,13 +129,12 @@ bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512) { unsigned char Buf[64*64]; - ssize_t Res = 0; - int ToEOF = (Size == 0); + bool const ToEOF = (Size == 0); while (Size != 0 || ToEOF) { unsigned long long n = sizeof(Buf); if (!ToEOF) n = std::min(Size, n); - Res = read(Fd,Buf,n); + ssize_t const Res = read(Fd,Buf,n); if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read return false; if (ToEOF && Res == 0) // EOF diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc index 289e43aa4..d02177724 100644 --- a/apt-pkg/contrib/hashsum.cc +++ b/apt-pkg/contrib/hashsum.cc @@ -9,13 +9,12 @@ /* */ bool SummationImplementation::AddFD(int const Fd, unsigned long long Size) { unsigned char Buf[64 * 64]; - ssize_t Res = 0; - int ToEOF = (Size == 0); + bool const ToEOF = (Size == 0); while (Size != 0 || ToEOF) { unsigned long long n = sizeof(Buf); if (!ToEOF) n = std::min(Size, n); - Res = read(Fd, Buf, n); + ssize_t const Res = read(Fd, Buf, n); if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read return false; if (ToEOF && Res == 0) // EOF @@ -27,7 +26,7 @@ bool SummationImplementation::AddFD(int const Fd, unsigned long long Size) { } bool SummationImplementation::AddFD(FileFd &Fd, unsigned long long Size) { unsigned char Buf[64 * 64]; - bool ToEOF = (Size == 0); + bool const ToEOF = (Size == 0); while (Size != 0 || ToEOF) { unsigned long long n = sizeof(Buf); diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 14ce133cf..1967d5d26 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -568,7 +568,6 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line) std::string prefix = APT::String::Strip(list[0]); std::string pkgname; std::string action; - ostringstream status; // "processing" has the form "processing: action: pkg or trigger" // with action = ["install", "configure", "remove", "purge", "disappear", @@ -1652,7 +1651,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) io_errors.push_back(string("failed in write on buffer copy for %s")); io_errors.push_back(string("short read on buffer copy for %s")); - for (vector::iterator I = io_errors.begin(); I != io_errors.end(); I++) + for (vector::iterator I = io_errors.begin(); I != io_errors.end(); ++I) { vector list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%'); if (list.size() > 1) { @@ -1767,13 +1766,11 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) string histfile_name = _config->FindFile("Dir::Log::History"); if (!histfile_name.empty()) { - FILE *log = NULL; - char buf[1024]; - fprintf(report, "DpkgHistoryLog:\n"); - log = fopen(histfile_name.c_str(),"r"); + FILE* log = fopen(histfile_name.c_str(),"r"); if(log != NULL) { + char buf[1024]; while( fgets(buf, sizeof(buf), log) != NULL) fprintf(report, " %s", buf); fclose(log); diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index fe065da4f..a3a4cc0e1 100644 --- a/apt-pkg/install-progress.cc +++ b/apt-pkg/install-progress.cc @@ -242,7 +242,7 @@ PackageManagerFancy::~PackageManagerFancy() void PackageManagerFancy::staticSIGWINCH(int signum) { std::vector::const_iterator I; - for(I = instances.begin(); I != instances.end(); I++) + for(I = instances.begin(); I != instances.end(); ++I) (*I)->HandleSIGWINCH(signum); } diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index a02ebf02d..898ee7222 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -61,7 +61,7 @@ class PackageNameMatcher : public Matcher /*{{{*/ public: PackageNameMatcher(const char **patterns) { - for(int i=0; patterns[i] != NULL; i++) + for(int i=0; patterns[i] != NULL; ++i) { std::string pattern = patterns[i]; #ifdef PACKAGE_MATCHER_ABI_COMPAT @@ -79,12 +79,12 @@ class PackageNameMatcher : public Matcher /*{{{*/ } virtual ~PackageNameMatcher() { - for(J=filters.begin(); J != filters.end(); J++) + for(J=filters.begin(); J != filters.end(); ++J) delete *J; } virtual bool operator () (const pkgCache::PkgIterator &P) { - for(J=filters.begin(); J != filters.end(); J++) + for(J=filters.begin(); J != filters.end(); ++J) { APT::CacheFilter::PackageMatcher *cachefilter = *J; if((*cachefilter)(P)) @@ -104,7 +104,7 @@ void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ std::ostream &outs) { for (pkgCache::VerIterator Ver = P.VersionList(); - Ver.end() == false; Ver++) + Ver.end() == false; ++Ver) ListSingleVersion(CacheFile, records, Ver, outs); } /*}}}*/ @@ -142,7 +142,7 @@ bool List(CommandLine &Cmd) Cache->Head().PackageCount, _("Listing")); GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress); - for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++) + for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); ++V) { std::stringstream outs; if(_config->FindB("APT::Cmd::All-Versions", false) == true) @@ -159,7 +159,7 @@ bool List(CommandLine &Cmd) // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status) // output the sorted map - for (K = output_map.begin(); K != output_map.end(); K++) + for (K = output_map.begin(); K != output_map.end(); ++K) std::cout << (*K).second << std::endl; diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc index ff4140fa7..ade12353a 100644 --- a/apt-private/private-search.cc +++ b/apt-private/private-search.cc @@ -61,18 +61,18 @@ bool FullTextSearch(CommandLine &CmdL) /*{{{*/ progress.OverallProgress(50, 100, 50, _("Full Text Search")); progress.SubProgress(bag.size()); int Done = 0; - for ( ;V != bag.end(); V++) + for ( ;V != bag.end(); ++V) { if (Done%500 == 0) progress.Progress(Done); - Done++; + ++Done; int i; pkgCache::DescIterator Desc = V.TranslatedDescription(); pkgRecords::Parser &parser = records.Lookup(Desc.FileList()); bool all_found = true; - for(i=0; patterns[i] != NULL; i++) + for(i=0; patterns[i] != NULL; ++i) { // FIXME: use regexp instead of simple find() const char *pattern = patterns[i]; @@ -93,7 +93,7 @@ bool FullTextSearch(CommandLine &CmdL) /*{{{*/ // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status) // output the sorted map - for (K = output_map.begin(); K != output_map.end(); K++) + for (K = output_map.begin(); K != output_map.end(); ++K) std::cout << (*K).second << std::endl; return true; diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 1fea589e2..265fb1a80 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -21,9 +21,9 @@ #include #include +#include #include #include -#include #include #include @@ -234,14 +234,12 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) else { // Update the mtime if necessary - if (UpdateMTime > 0 && + if (UpdateMTime > 0 && (Now - St.st_mtime > (signed)UpdateMTime || St.st_mtime > Now)) { - struct utimbuf Buf; - Buf.actime = Buf.modtime = Now; - utime(I->Output.c_str(),&Buf); + utimensat(AT_FDCWD, I->Output.c_str(), NULL, AT_SYMLINK_NOFOLLOW); Changed = true; - } + } } // Force the file permissions diff --git a/methods/connect.cc b/methods/connect.cc index fc7a72ee9..d9c9a1dd4 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -142,9 +142,9 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd, // Convert the port name/number char ServStr[300]; if (Port != 0) - snprintf(ServStr,sizeof(ServStr),"%u",Port); + snprintf(ServStr,sizeof(ServStr),"%i", Port); else - snprintf(ServStr,sizeof(ServStr),"%s",Service); + snprintf(ServStr,sizeof(ServStr),"%s", Service); /* We used a cached address record.. Yes this is against the spec but the way we have setup our rotating dns suggests that this is more @@ -190,7 +190,7 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd, { if (DefPort != 0) { - snprintf(ServStr,sizeof(ServStr),"%u",DefPort); + snprintf(ServStr, sizeof(ServStr), "%i", DefPort); DefPort = 0; continue; } diff --git a/methods/copy.cc b/methods/copy.cc index e81d0022b..744cc2b51 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -18,7 +18,6 @@ #include #include -#include #include #include /*}}}*/ @@ -71,18 +70,19 @@ bool CopyMethod::Fetch(FetchItem *Itm) } From.Close(); - To.Close(); - + // Transfer the modification times - struct utimbuf TimeBuf; - TimeBuf.actime = Buf.st_atime; - TimeBuf.modtime = Buf.st_mtime; - if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) + struct timespec times[2]; + times[0].tv_sec = Buf.st_atime; + times[1].tv_sec = Buf.st_mtime; + times[0].tv_nsec = times[1].tv_nsec = 0; + if (futimens(To.Fd(), times) != 0) { To.OpFail(); - return _error->Errno("utime",_("Failed to set modification time")); + return _error->Errno("futimens",_("Failed to set modification time")); } - + To.Close(); + Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); Hash.AddFD(Fd); diff --git a/methods/ftp.cc b/methods/ftp.cc index 979adca62..2d05364d5 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -953,14 +952,16 @@ void FtpMethod::SigTerm(int) { if (FailFd == -1) _exit(100); - close(FailFd); - + // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(FailFile.c_str(),&UBuf); - + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(FailFd, times); + + close(FailFd); + _exit(100); } /*}}}*/ @@ -1059,13 +1060,14 @@ bool FtpMethod::Fetch(FetchItem *Itm) if (Server->Get(File,Fd,Res.ResumePoint,Hash,Missing) == false) { Fd.Close(); - + // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(FailFile.c_str(),&UBuf); - + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(FailFd, times); + // If the file is missing we hard fail and delete the destfile // otherwise transient fail if (Missing == true) { @@ -1077,20 +1079,21 @@ bool FtpMethod::Fetch(FetchItem *Itm) } Res.Size = Fd.Size(); + + // Timestamp + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(Fd.Fd(), times); + FailFd = -1; } - + Res.LastModified = FailTime; Res.TakeHashes(Hash); - - // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(Queue->DestFile.c_str(),&UBuf); - FailFd = -1; URIDone(Res); - + return true; } /*}}}*/ diff --git a/methods/gzip.cc b/methods/gzip.cc index 48c8e9892..f1edb353b 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -94,32 +93,35 @@ bool GzipMethod::Fetch(FetchItem *Itm) } From.Close(); - To.Close(); - + if (Failed == true) return false; - + // Transfer the modification times struct stat Buf; if (stat(Path.c_str(),&Buf) != 0) return _error->Errno("stat",_("Failed to stat")); - struct utimbuf TimeBuf; - TimeBuf.actime = Buf.st_atime; - TimeBuf.modtime = Buf.st_mtime; - if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime",_("Failed to set modification time")); + struct timespec times[2]; + times[0].tv_sec = Buf.st_atime; + times[1].tv_sec = Buf.st_mtime; + times[0].tv_nsec = times[1].tv_nsec = 0; + if (futimens(To.Fd(), times) != 0) + { + To.OpFail(); + return _error->Errno("futimens",_("Failed to set modification time")); + } + Res.Size = To.FileSize(); + To.Close(); if (stat(Itm->DestFile.c_str(),&Buf) != 0) return _error->Errno("stat",_("Failed to stat")); - + // Return a Done response Res.LastModified = Buf.st_mtime; - Res.Size = Buf.st_size; Res.TakeHashes(Hash); URIDone(Res); - return true; } /*}}}*/ diff --git a/methods/http.cc b/methods/http.cc index b22b61efc..e1390afcb 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -97,8 +97,6 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { - unsigned long long BwReadMax; - while (1) { // Woops, buffer is full @@ -106,7 +104,7 @@ bool CircleBuf::Read(int Fd) return true; // what's left to read in this tick - BwReadMax = CircleBuf::BwReadLimit/BW_HZ; + unsigned long long const BwReadMax = CircleBuf::BwReadLimit/BW_HZ; if(CircleBuf::BwReadLimit) { struct timeval now; diff --git a/methods/https.cc b/methods/https.cc index 2a562434b..e16e36339 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -405,10 +404,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_getinfo(curl, CURLINFO_FILETIME, &Res.LastModified); if (Res.LastModified != -1) { - struct utimbuf UBuf; - UBuf.actime = Res.LastModified; - UBuf.modtime = Res.LastModified; - utime(File->Name().c_str(),&UBuf); + struct timespec times[2]; + times[0].tv_sec = Res.LastModified; + times[1].tv_sec = Res.LastModified; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(File->Fd(), times); } else Res.LastModified = resultStat.st_mtime; diff --git a/methods/https.h b/methods/https.h index 8632d6d02..89a89d19c 100644 --- a/methods/https.h +++ b/methods/https.h @@ -65,7 +65,7 @@ class HttpsMethod : public pkgAcqMethod public: FileFd *File; - HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) + HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), File(NULL) { File = 0; curl = curl_easy_init(); diff --git a/methods/mirror.cc b/methods/mirror.cc index 854366318..83ef0d133 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -114,7 +114,7 @@ bool MirrorMethod::Clean(string Dir) for(I=list.begin(); I != list.end(); ++I) { string uri = (*I)->GetURI(); - if(uri.find("mirror://") != 0) + if(uri.compare(0, strlen("mirror://"), "mirror://") != 0) continue; string BaseUri = uri.substr(0,uri.size()-1); if (URItoFileName(BaseUri) == Dir->d_name) @@ -198,9 +198,9 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file) // "stable" on the same machine. this is to avoid running into out-of-sync // issues (i.e. Release/Release.gpg different on each mirror) struct utsname buf; - int seed=1, i; + int seed=1; if(uname(&buf) == 0) { - for(i=0,seed=1; buf.nodename[i] != 0; i++) { + for(int i=0,seed=1; buf.nodename[i] != 0; ++i) { seed = seed * 31 + buf.nodename[i]; } } @@ -306,7 +306,7 @@ bool MirrorMethod::InitMirrors() if (s.size() == 0) continue; // ignore non http lines - if (s.find("http://") != 0) + if (s.compare(0, strlen("http://"), "http://") != 0) continue; AllMirrors.push_back(s); diff --git a/methods/rsh.cc b/methods/rsh.cc index d76dca6ef..a441220bf 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -395,13 +394,14 @@ void RSHMethod::SigTerm(int sig) { if (FailFd == -1) _exit(100); - close(FailFd); - // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(FailFile.c_str(),&UBuf); + // Transfer the modification times + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(FailFd, times); + close(FailFd); _exit(100); } @@ -488,10 +488,11 @@ bool RSHMethod::Fetch(FetchItem *Itm) Fd.Close(); // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(FailFile.c_str(),&UBuf); + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(FailFd, times); // If the file is missing we hard fail otherwise transient fail if (Missing == true) @@ -501,18 +502,17 @@ bool RSHMethod::Fetch(FetchItem *Itm) } Res.Size = Fd.Size(); + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(Fd.Fd(), times); + FailFd = -1; } Res.LastModified = FailTime; Res.TakeHashes(Hash); - // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(Queue->DestFile.c_str(),&UBuf); - FailFd = -1; - URIDone(Res); return true; diff --git a/methods/server.cc b/methods/server.cc index a2128441c..e12c23c07 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -17,9 +17,9 @@ #include #include +#include #include #include -#include #include #include #include @@ -368,14 +368,14 @@ void ServerMethod::SigTerm(int) { if (FailFd == -1) _exit(100); + + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(FailFd, times); close(FailFd); - - // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(FailFile.c_str(),&UBuf); - + _exit(100); } /*}}}*/ @@ -539,11 +539,10 @@ int ServerMethod::Loop() File = 0; // Timestamp - struct utimbuf UBuf; - time(&UBuf.actime); - UBuf.actime = Server->Date; - UBuf.modtime = Server->Date; - utime(Queue->DestFile.c_str(),&UBuf); + struct timespec times[2]; + times[0].tv_sec = times[1].tv_sec = Server->Date; + times[0].tv_nsec = times[1].tv_nsec = 0; + utimensat(AT_FDCWD, Queue->DestFile.c_str(), times, AT_SYMLINK_NOFOLLOW); // Send status to APT if (Result == true) diff --git a/methods/server.h b/methods/server.h index 4dc6a1f2f..2b81e6173 100644 --- a/methods/server.h +++ b/methods/server.h @@ -137,7 +137,7 @@ class ServerMethod : public pkgAcqMethod virtual ServerState * CreateServerState(URI uri) = 0; virtual void RotateDNS() = 0; - ServerMethod(const char *Ver,unsigned long Flags = 0) : pkgAcqMethod(Ver, Flags), PipelineDepth(0), AllowRedirect(false), Debug(false) {}; + ServerMethod(const char *Ver,unsigned long Flags = 0) : pkgAcqMethod(Ver, Flags), Server(NULL), File(NULL), PipelineDepth(0), AllowRedirect(false), Debug(false) {}; virtual ~ServerMethod() {}; }; diff --git a/test/interactive-helper/rpmver.cc b/test/interactive-helper/rpmver.cc index 9fc807de8..15c96cbbe 100644 --- a/test/interactive-helper/rpmver.cc +++ b/test/interactive-helper/rpmver.cc @@ -2,6 +2,7 @@ #include #include #include +#include #include #define xisdigit(x) isdigit(x) @@ -12,10 +13,8 @@ using namespace std; int rpmvercmp(const char * a, const char * b) { - char oldch1, oldch2; char * str1, * str2; char * one, * two; - int rc; int isnum; /* easy comparison to see if versions are identical */ @@ -53,9 +52,9 @@ int rpmvercmp(const char * a, const char * b) /* save character at the end of the alpha or numeric segment */ /* so that they can be restored after the comparison */ - oldch1 = *str1; + char oldch1 = *str1; *str1 = '\0'; - oldch2 = *str2; + char oldch2 = *str2; *str2 = '\0'; /* take care of the case where the two version segments are */ @@ -81,7 +80,7 @@ int rpmvercmp(const char * a, const char * b) /* segments are alpha or if they are numeric. don't return */ /* if they are equal because there might be more segments to */ /* compare */ - rc = strcmp(one, two); + int rc = strcmp(one, two); if (rc) return rc; /* restore character that was replaced by null above */ -- cgit v1.2.3 From 5fd25d678f51cfa013643efe3429eb08b9504058 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 16 Jan 2014 23:00:27 +0100 Subject: use gpg --homedir instead of explicit file placement Avoids that gpg gets the idea it could use files from the user which weren't overridden specifically like secret keyring and trustdb as before. --- cmdline/apt-key.in | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 463e4b4b4..0ced500db 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -5,22 +5,23 @@ unset GREP_OPTIONS GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring" -# gpg needs a trustdb to function, but it can't be invalid (not even empty) -# so we create a temporary directory to store our fresh readable trustdb in -TRUSTDBDIR="$(mktemp -d)" -CURRENTTRAP="${CURRENTTRAP} rm -rf '${TRUSTDBDIR}';" +# gpg needs (in different versions more or less) files to function correctly, +# so we give it its own homedir and generate some valid content for it +GPGHOMEDIR="$(mktemp -d)" +CURRENTTRAP="${CURRENTTRAP} rm -rf '${GPGHOMEDIR}';" trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM -chmod 700 "$TRUSTDBDIR" -# We also don't use a secret keyring, of course, but gpg panics and +chmod 700 "$GPGHOMEDIR" +# We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available - and writeable for imports -SECRETKEYRING="${TRUSTDBDIR}/secring.gpg" +SECRETKEYRING="${GPGHOMEDIR}/secring.gpg" touch $SECRETKEYRING -GPG_CMD="$GPG_CMD --secret-keyring $SECRETKEYRING" -GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg" - -# now create the trustdb with an (empty) dummy keyring -$GPG_CMD --quiet --check-trustdb --keyring $SECRETKEYRING -# and make sure that gpg isn't trying to update the file +GPG_CMD="$GPG_CMD --homedir $GPGHOMEDIR" +# create the trustdb with an (empty) dummy keyring +# older gpgs required it, newer gpgs even warn that it isn't needed, +# but require it nontheless for some commands, so we just play safe +# here for the foreseeable future and create a dummy one +$GPG_CMD --quiet --check-trustdb --keyring $SECRETKEYRING >/dev/null 2>&1 +# tell gpg that it shouldn't try to maintain a trustdb file GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always" GPG="$GPG_CMD" -- cgit v1.2.3 From 77a45bebc9168b396334630ef109c1d48ddaf930 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 16 Jan 2014 23:51:05 +0100 Subject: use our own homedir for gpg in testcases Git-Dch: Ignore --- test/integration/framework | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index c4953812b..1db1946db 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -124,6 +124,13 @@ gdb() { http() { LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/http } +gpg() { + # see apt-key for the whole trickery. Setup is done in setupenvironment + command gpg --ignore-time-conflict --no-options --no-default-keyring \ + --homedir "${TMPWORKINGDIRECTORY}/gnupghome" \ + --no-auto-check-trustdb --trust-model always \ + "$@" +} exitwithstatus() { # error if we about to overflow, but ... @@ -205,6 +212,20 @@ setupenvironment() { export LC_ALL=C.UTF-8 export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" configcompression '.' 'gz' #'bz2' 'lzma' 'xz' + + # gpg needs a trustdb to function, but it can't be invalid (not even empty) + # see also apt-key where this trickery comes from: + local TRUSTDBDIR="${TMPWORKINGDIRECTORY}/gnupghome" + mkdir "$TRUSTDBDIR" + chmod 700 "$TRUSTDBDIR" + # We also don't use a secret keyring, of course, but gpg panics and + # implodes if there isn't one available - and writeable for imports + local SECRETKEYRING="${TRUSTDBDIR}/secring.gpg" + touch $SECRETKEYRING + # now create the trustdb with an (empty) dummy keyring + # newer gpg versions are fine without it, but play it safe for now + gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1 + msgdone "info" } @@ -390,7 +411,7 @@ Package: $NAME" >> ${BUILDDIR}/debian/control | while read SRC; do echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist # if expr match "${SRC}" '.*\.dsc' >/dev/null 2>&1; then -# gpg --yes --no-default-keyring --secret-keyring ./keys/joesixpack.sec \ +# gpg --yes --secret-keyring ./keys/joesixpack.sec \ # --keyring ./keys/joesixpack.pub --default-key 'Joe Sixpack' \ # --clearsign -o "${BUILDDIR}/../${SRC}.sign" "${BUILDDIR}/../$SRC" # mv "${BUILDDIR}/../${SRC}.sign" "${BUILDDIR}/../$SRC" @@ -764,7 +785,7 @@ setupaptarchive() { signreleasefiles() { local SIGNER="${1:-Joe Sixpack}" - local GPG="gpg --batch --yes --no-default-keyring --trustdb-name rootdir/etc/apt/trustdb.gpg" + local GPG="gpg --batch --yes" msgninfo "\tSign archive with $SIGNER key… " local REXKEY='keys/rexexpired' local SECEXPIREBAK="${REXKEY}.sec.bak" -- cgit v1.2.3 From 0954c58eeb07f5c3c6e6385e0547924a4917c21d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 17 Jan 2014 01:02:47 +0100 Subject: improve stdout/stderr usage correctness in test framework Also adds a friendly note about how many tests were run/passed so that the end of the testrun isn't all that negative by just showing fails. (It now tells us that we have 111 tests at the moment!) Git-Dch: Ignore --- test/integration/framework | 26 +++++++++++++------------- test/integration/run-tests | 22 +++++++++++++++------- test/integration/test-apt-get-download | 3 ++- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 1db1946db..8d9f99d64 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -19,24 +19,24 @@ fi msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; } msgwarn() { echo "${CWARNING}W: $1${CNORMAL}" >&2; } -msgmsg() { echo "${CMSG}$1${CNORMAL}" >&2; } -msginfo() { echo "${CINFO}I: $1${CNORMAL}" >&2; } -msgdebug() { echo "${CDEBUG}D: $1${CNORMAL}" >&2; } -msgdone() { echo "${CDONE}DONE${CNORMAL}" >&2; } +msgmsg() { echo "${CMSG}$1${CNORMAL}"; } +msginfo() { echo "${CINFO}I: $1${CNORMAL}"; } +msgdebug() { echo "${CDEBUG}D: $1${CNORMAL}"; } +msgdone() { echo "${CDONE}DONE${CNORMAL}"; } msgnwarn() { echo -n "${CWARNING}W: $1${CNORMAL}" >&2; } -msgnmsg() { echo -n "${CMSG}$1${CNORMAL}" >&2; } -msgninfo() { echo -n "${CINFO}I: $1${CNORMAL}" >&2; } -msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}" >&2; } +msgnmsg() { echo -n "${CMSG}$1${CNORMAL}"; } +msgninfo() { echo -n "${CINFO}I: $1${CNORMAL}"; } +msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}"; } msgtest() { while [ -n "$1" ]; do - echo -n "${CINFO}$1${CCMD} " >&2; - echo -n "$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} " >&2; + echo -n "${CINFO}$1${CCMD} " + echo -n "$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} " shift if [ -n "$1" ]; then shift; else break; fi done - echo -n "…${CNORMAL} " >&2; + echo -n "…${CNORMAL} " } -msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; } +msgpass() { echo "${CPASS}PASS${CNORMAL}"; } msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; } msgfail() { if [ $# -gt 0 ]; then echo "${CFAIL}FAIL: $*${CNORMAL}" >&2; @@ -57,7 +57,7 @@ if [ $MSGLEVEL -le 2 ]; then msgmsg() { true; } msgnmsg() { true; } msgtest() { true; } - msgpass() { echo -n " ${CPASS}P${CNORMAL}" >&2; } + msgpass() { echo -n " ${CPASS}P${CNORMAL}"; } msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; } if [ -n "$CFAIL" ]; then msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); } @@ -81,7 +81,7 @@ msgdone() { [ "$1" = "die" -a $MSGLEVEL -le 0 ]; then true; else - echo "${CDONE}DONE${CNORMAL}" >&2; + echo "${CDONE}DONE${CNORMAL}"; fi } diff --git a/test/integration/run-tests b/test/integration/run-tests index 7316016e2..881c1c56b 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -2,6 +2,9 @@ set -e FAIL=0 +PASS=0 +ALL=0 + FAILED_TESTS="" DIR=$(readlink -f $(dirname $0)) if [ "$1" = "-q" ]; then @@ -29,18 +32,23 @@ for testcase in $(run-parts --list $DIR | grep '/test-'); do echo "${CTEST}Run Testcase ${CHIGH}$(basename ${testcase})${CRESET}" fi if ! ${testcase}; then - FAIL=$((FAIL+1)) - FAILED_TESTS="$FAILED_TESTS $(basename $testcase)" - echo "$(basename $testcase) ... FAIL" - fi + FAIL=$((FAIL+1)) + FAILED_TESTS="$FAILED_TESTS $(basename $testcase)" + echo >&2 "$(basename $testcase) ... FAIL" + else + PASS=$((PASS+1)) + fi + ALL=$((ALL+1)) if [ "$MSGLEVEL" -le 2 ]; then echo fi done -echo "failures: $FAIL" -if [ -n "$FAILED_TESTS" ]; then - echo "Failed tests: $FAILED_TESTS"; +echo >&2 "Statistics: $ALL tests were run: $PASS successfully and $FAIL failed" +if [ -n "$FAILED_TESTS" ]; then + echo >&2 "Failed tests: $FAILED_TESTS" +else + echo >&2 'All tests seem to have been run successfully. What could possibly go wrong?' fi # ensure we don't overflow exit $((FAIL <= 255 ? FAIL : 255)) diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index 6eac079f3..fce0be018 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -19,7 +19,8 @@ testdownload() { APT="${APT}/${3}" fi msgtest "Test download of package file $1 with" "$APT" - aptget -qq download ${APT} && test -f $1 && msgpass || msgfail + testsuccess --nomsg aptget download ${APT} + testsuccess test -f $1 rm $1 } -- cgit v1.2.3 From 82e7f817a434e29df9ec6fbf19acfd8e7cd890e5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jan 2014 07:48:43 +0100 Subject: add apt upgrade --dist --- apt-private/private-cmndline.cc | 5 +++++ cmdline/apt.cc | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index d6d7bca64..cbb40d42e 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -230,6 +230,11 @@ bool addArgumentsAPT(std::vector &Args, char const * const Cm addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0); addArg('a', "all-versions", "APT::Cmd::All-Versions", 0); } + else if (CmdMatches("upgrade")) + { + // FIXME: find a better term + addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean); + } else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd)) { // we have no (supported) command-name overlaps so far, so we call diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 4bcae0aba..4dc826632 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -86,6 +86,15 @@ bool ShowHelp(CommandLine &CmdL) return true; } +// figure out what kind of upgrade the user wants +bool DoAptUpgrade(CommandLine &CmdL) +{ + if (_config->FindB("Apt::Cmd::Dist-Upgrade")) + return DoDistUpgrade(CmdL); + else + return DoUpgradeWithAllowNewPackages(CmdL); +} + int main(int argc, const char *argv[]) /*{{{*/ { CommandLine::Dispatch Cmds[] = {{"list",&List}, @@ -95,7 +104,7 @@ int main(int argc, const char *argv[]) /*{{{*/ {"install",&DoInstall}, {"remove", &DoInstall}, {"update",&DoUpdate}, - {"upgrade",&DoUpgradeWithAllowNewPackages}, + {"upgrade",&DoAptUpgrade}, // misc {"edit-sources",&EditSources}, // helper -- cgit v1.2.3 From b7159ec8835e61ea3069213d9188be91c109e32c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jan 2014 07:52:22 +0100 Subject: reword !isatty() warning --- cmdline/apt.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 4dc826632..2d3966e86 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -117,10 +117,9 @@ int main(int argc, const char *argv[]) /*{{{*/ if(!isatty(1)) { std::cerr << std::endl - << "WARNING WARNING " - << argv[0] - << " is *NOT* intended for scripts " - << "use at your own peril^Wrisk" + << "WARNING: " << argv[0] << " " + << "does not have a stable CLI interface yet. " + << "Use with caution in scripts." << std::endl << std::endl; } -- cgit v1.2.3 From 1410955589dc9f0eaa290907cac070b7ebf93b6a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jan 2014 08:43:14 +0100 Subject: add missing integration test for "apt list" --- apt-private/private-list.cc | 12 ++++++---- apt-private/private-output.cc | 8 ++++--- cmdline/apt.cc | 23 +++++++++++--------- test/integration/framework | 10 +++++---- test/integration/test-apt-binary | 47 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 21 deletions(-) create mode 100755 test/integration/test-apt-binary diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index a02ebf02d..fbb66d204 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -101,11 +101,15 @@ private: /*}}}*/ void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ pkgCache::PkgIterator P, - std::ostream &outs) + std::ostream &outs, + bool include_summary=true) { for (pkgCache::VerIterator Ver = P.VersionList(); Ver.end() == false; Ver++) - ListSingleVersion(CacheFile, records, Ver, outs); + { + ListSingleVersion(CacheFile, records, Ver, outs, include_summary); + outs << "\n"; + } } /*}}}*/ // list - list package based on criteria /*{{{*/ @@ -136,7 +140,7 @@ bool List(CommandLine &Cmd) PackageNameMatcher matcher(patterns); LocalitySortedVersionSet bag; - OpTextProgress progress; + OpTextProgress progress(*_config); progress.OverallProgress(0, Cache->Head().PackageCount, Cache->Head().PackageCount, @@ -147,7 +151,7 @@ bool List(CommandLine &Cmd) std::stringstream outs; if(_config->FindB("APT::Cmd::All-Versions", false) == true) { - ListAllVersions(CacheFile, records, V.ParentPkg(), outs); + ListAllVersions(CacheFile, records, V.ParentPkg(), outs, includeSummary); output_map.insert(std::make_pair( V.ParentPkg().Name(), outs.str())); } else { diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 91d13f31b..a8bbad9e5 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -114,11 +114,13 @@ std::string GetVersion(pkgCacheFile &CacheFile, pkgCache::VerIterator V)/*{{{*/ pkgCache::PkgIterator P = V.ParentPkg(); if (V == P.CurrentVer()) { + std::string inst_str = DeNull(V.VerStr()); +#if 0 // FIXME: do we want this or something like this? pkgDepCache *DepCache = CacheFile.GetDepCache(); pkgDepCache::StateCache &state = (*DepCache)[P]; - std::string inst_str = DeNull(V.VerStr()); if (state.Upgradable()) return "**"+inst_str; +#endif return inst_str; } @@ -224,11 +226,11 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ else out << GetVersion(CacheFile, V); } - out << " " << GetArchitecture(CacheFile, P) << " "; + out << " " << GetArchitecture(CacheFile, P); if (include_summary) { out << std::endl - << " " << GetShortDescription(CacheFile, records, P) + << " " << GetShortDescription(CacheFile, records, P) << std::endl; } } diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 2d3966e86..8dc4c292a 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -114,16 +114,6 @@ int main(int argc, const char *argv[]) /*{{{*/ std::vector Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv)); - if(!isatty(1)) - { - std::cerr << std::endl - << "WARNING: " << argv[0] << " " - << "does not have a stable CLI interface yet. " - << "Use with caution in scripts." - << std::endl - << std::endl; - } - InitOutput(); // Set up gettext support @@ -149,6 +139,19 @@ int main(int argc, const char *argv[]) /*{{{*/ return 100; } + if(!isatty(STDOUT_FILENO) && + _config->FindB("Apt::Cmd::Disable-Script-Warning", false) == false) + { + std::cerr << std::endl + << "WARNING: " << argv[0] << " " + << "does not have a stable CLI interface yet. " + << "Use with caution in scripts." + << std::endl + << std::endl; + } + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) + _config->Set("quiet","1"); + // See if the help should be shown if (_config->FindB("help") == true || _config->FindB("version") == true || diff --git a/test/integration/framework b/test/integration/framework index a28363768..6620c78dd 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -99,6 +99,7 @@ aptconfig() { runapt apt-config $*; } aptcache() { runapt apt-cache $*; } aptcdrom() { runapt apt-cdrom $*; } aptget() { runapt apt-get $*; } +apt() { runapt apt $*; } aptftparchive() { runapt apt-ftparchive $*; } aptkey() { runapt apt-key $*; } aptmark() { runapt apt-mark $*; } @@ -202,6 +203,7 @@ setupenvironment() { echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf echo 'quiet::NoUpdate "true";' >> aptconfig.conf echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https + echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary export LC_ALL=C export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" configcompression '.' 'gz' #'bz2' 'lzma' 'xz' @@ -288,7 +290,7 @@ setupsimplenativepackage() { local VERSION="$3" local RELEASE="${4:-unstable}" local DEPENDENCIES="$5" - local DESCRIPTION="${6:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" @@ -338,7 +340,7 @@ buildsimplenativepackage() { local VERSION="$3" local RELEASE="${4:-unstable}" local DEPENDENCIES="$5" - local DESCRIPTION="${6:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" @@ -535,7 +537,7 @@ insertpackage() { local VERSION="$4" local DEPENDENCIES="$5" local PRIORITY="${6:-optional}" - local DESCRIPTION="${7:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" @@ -595,7 +597,7 @@ insertinstalledpackage() { local DEPENDENCIES="$4" local PRIORITY="${5:-optional}" local STATUS="${6:-install ok installed}" - local DESCRIPTION="${7:-"Description: an autogenerated dummy ${NAME}=${VERSION}/installed + local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/installed If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" diff --git a/test/integration/test-apt-binary b/test/integration/test-apt-binary new file mode 100755 index 000000000..8d5df9051 --- /dev/null +++ b/test/integration/test-apt-binary @@ -0,0 +1,47 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +insertpackage 'unstable' 'foo' 'all' '1.0' +insertinstalledpackage 'bar' 'i386' '1.0' + +insertinstalledpackage 'foobar' 'i386' '1.0' +insertpackage 'unstable' 'foobar' 'i386' '2.0' + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +testequal "Listing... +bar/now 1.0 [installed,local] i386 +foo/unstable 1.0 all +foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list + +testequal "Listing... +foo/unstable 1.0 all +foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list "foo*" + +testequal "Listing... +foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list --upgradable + +# FIXME: hm, hm - does it make sense to have this different? shouldn't +# we use "installed,upgradable" consitently? +testequal "Listing... +bar/now 1.0 [installed,local] i386 +foobar/now 1.0 [installed,upgradable to: 2.0] i386" apt list --installed + +testequal "Listing... +foobar/unstable 2.0 [upgradable from: 1.0] i386 +foobar/now 1.0 [installed,upgradable to: 2.0] i386 +" apt list foobar --all-versions + +testequal "Listing... +bar/now 1.0 [installed,local] i386 + an autogenerated dummy bar=1.0/installed +" apt list bar --verbose + -- cgit v1.2.3 From 846856f450a06dcb91bb214791b4eda2380f20ff Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 17 Jan 2014 17:36:47 +0100 Subject: correct some quoting offenses also avoids redirecting messages from dpkg-deb to /dev/null as it might fail (as it is quiet picky) and we should know why if it does. Git-Dch: Ignore --- test/integration/framework | 74 +++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 8d9f99d64..066cdb265 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -87,39 +87,41 @@ msgdone() { runapt() { msgdebug "Executing: ${CCMD}$*${CDEBUG} " + local CMD="$1" + shift if [ -f ./aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" elif [ -f ../aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" else - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" fi } -aptconfig() { runapt apt-config $*; } -aptcache() { runapt apt-cache $*; } -aptcdrom() { runapt apt-cdrom $*; } -aptget() { runapt apt-get $*; } -aptftparchive() { runapt apt-ftparchive $*; } -aptkey() { runapt apt-key $*; } -aptmark() { runapt apt-mark $*; } +aptconfig() { runapt apt-config "$@"; } +aptcache() { runapt apt-cache "$@"; } +aptcdrom() { runapt apt-cdrom "$@"; } +aptget() { runapt apt-get "$@"; } +aptftparchive() { runapt apt-ftparchive "$@"; } +aptkey() { runapt apt-key "$@"; } +aptmark() { runapt apt-mark "$@"; } aptwebserver() { - LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver $*; + LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver "$@"; } dpkg() { - $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $* + command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" } aptitude() { if [ -f ./aptconfig.conf ]; then - APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which aptitude) $* + APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" elif [ -f ../aptconfig.conf ]; then - APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which aptitude) $* + APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" else - LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which aptitude) $* + LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" fi } gdb() { echo "gdb: run »$*«" - APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1 --args $* + APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command gdb ${BUILDDIRECTORY}/$1 --args "$@" } http() { LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/http @@ -203,7 +205,7 @@ setupenvironment() { echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf - if ! $(which dpkg) --assert-multi-arch >/dev/null 2>&1; then + if ! command dpkg --assert-multi-arch >/dev/null 2>&1; then echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it… fi echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf @@ -267,7 +269,7 @@ configdpkg() { fi fi rm -f rootdir/etc/apt/apt.conf.d/00foreigndpkg - if $(which dpkg) --assert-multi-arch >/dev/null 2>&1; then + if command dpkg --assert-multi-arch >/dev/null 2>&1 ; then local ARCHS="$(getarchitectures)" if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then DPKGARCH="$(dpkg --print-architecture)" @@ -429,7 +431,12 @@ Package: $NAME" >> ${BUILDDIR}/debian/control (cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$arch) (cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums) - dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. 2> /dev/null > /dev/null + local LOG="${BUILDDIR}/../${NAME}_${VERSION}_${arch}.dpkg-deb.log" + if ! dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. >$LOG 2>&1; then + cat $LOG + false + fi + rm $LOG echo "pool/${NAME}_${VERSION}_${arch}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist done @@ -445,14 +452,19 @@ buildpackage() { local RELEASE=$2 local SECTION=$3 local ARCH=$(getarchitecture $4) - msgninfo "Build package $(echo "$BUILDDIR" | grep -o '[^/]*$') for ${RELEASE} in ${SECTION}… " + local PKGNAME="$(echo "$BUILDDIR" | grep -o '[^/]*$')" + local BUILDLOG="$(readlink -f "${BUILDDIR}/../${PKGNAME}_${RELEASE}_${SECTION}.dpkg-bp.log")" + msgninfo "Build package ${PKGNAME} for ${RELEASE} in ${SECTION}… " cd $BUILDDIR if [ "$ARCH" = "all" ]; then ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)" fi - local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)" - local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")" - local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')" + if ! dpkg-buildpackage -uc -us -a$ARCH >$BUILDLOG 2>&1 ; then + cat $BUILDLOG + false + fi + local PKGS="$(grep '^dpkg-deb: building package' $BUILDLOG | cut -d'/' -f 2 | sed -e "s#'\.##")" + local SRCS="$(grep '^dpkg-source: info: building' $BUILDLOG | grep -o '[a-z0-9._+~-]*$')" cd - > /dev/null for PKG in $PKGS; do echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist @@ -465,9 +477,9 @@ buildpackage() { buildaptarchive() { if [ -d incoming ]; then - buildaptarchivefromincoming $* + buildaptarchivefromincoming "$@" else - buildaptarchivefromfiles $* + buildaptarchivefromfiles "$@" fi } @@ -952,7 +964,7 @@ Filename: ${2} } checkdiff() { - local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')" + local DIFFTEXT="$(command diff -u "$@" | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')" if [ -n "$DIFFTEXT" ]; then echo echo "$DIFFTEXT" @@ -1026,7 +1038,7 @@ N: No packages found" testnopackage() { msgtest "Test for non-existent packages" "apt-cache show $*" - local SHOWPKG="$(aptcache show $* 2>&1 | grep '^Package: ')" + local SHOWPKG="$(aptcache show "$@" 2>&1 | grep '^Package: ')" if [ -n "$SHOWPKG" ]; then echo echo "$SHOWPKG" @@ -1038,10 +1050,10 @@ testnopackage() { testdpkginstalled() { msgtest "Test for correctly installed package(s) with" "dpkg -l $*" - local PKGS="$(dpkg -l $* 2>/dev/null | grep '^i' | wc -l)" + local PKGS="$(dpkg -l "$@" 2>/dev/null | grep '^i' | wc -l)" if [ "$PKGS" != $# ]; then echo $PKGS - dpkg -l $* | grep '^[a-z]' + dpkg -l "$@" | grep '^[a-z]' msgfail return 1 fi @@ -1050,10 +1062,10 @@ testdpkginstalled() { testdpkgnotinstalled() { msgtest "Test for correctly not-installed package(s) with" "dpkg -l $*" - local PKGS="$(dpkg -l $* 2> /dev/null | grep '^i' | wc -l)" + local PKGS="$(dpkg -l "$@" 2> /dev/null | grep '^i' | wc -l)" if [ "$PKGS" != 0 ]; then echo - dpkg -l $* | grep '^[a-z]' + dpkg -l "$@" | grep '^[a-z]' msgfail return 1 fi -- cgit v1.2.3 From 039382803d4172d512789e507c1e9a2559a4f235 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 17 Jan 2014 17:53:15 +0100 Subject: use our tmpdir instead of creating tmpfiles Maintaining (mainly the deletion of them) is a pain and they litter /tmp while the testcase is run for no good reason as we could just as well drop it into our tmpdir we have anyway and let them be deleted with the rest automatically Git-Dch: Ignore --- test/integration/framework | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 066cdb265..bbe77dcf8 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -179,7 +179,7 @@ setupenvironment() { mkdir rootdir aptarchive keys cd rootdir mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d - mkdir -p var/cache var/lib var/log + mkdir -p var/cache var/lib var/log tmp mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers touch var/lib/dpkg/available mkdir -p usr/lib/apt @@ -844,8 +844,7 @@ webserverconfig() { downloadfile "http://localhost:8080/_config/set/${1}/${2}" '/dev/null' >/dev/null local DOWNLOG='download-testfile.log' rm -f "$DOWNLOG" - local STATUS="$(mktemp)" - addtrap "rm $STATUS;" + local STATUS="${TMPWORKINGDIRECTORY}/rootdir/tmp/webserverconfig.status" downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" if [ "$(cat "$STATUS")" = '200' ]; then msgpass @@ -853,6 +852,7 @@ webserverconfig() { cat >&2 "$DOWNLOG" msgfail "Statuscode was $(cat "$STATUS")" fi + rm "$STATUS" } rewritesourceslist() { @@ -870,9 +870,7 @@ changetowebserver() { fi if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then cd aptarchive - local LOG="$(mktemp)" - addtrap "rm $LOG;" - if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then + if ! aptwebserver -o aptwebserver::fork=1 "$@" >webserver.log 2>&1 ; then cat $LOG false fi @@ -991,8 +989,7 @@ testempty() { } testequal() { - local COMPAREFILE=$(mktemp) - addtrap "rm $COMPAREFILE;" + local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile" echo "$1" > $COMPAREFILE shift msgtest "Test for equality of" "$*" @@ -1000,10 +997,9 @@ testequal() { } testequalor2() { - local COMPAREFILE1=$(mktemp) - local COMPAREFILE2=$(mktemp) - local COMPAREAGAINST=$(mktemp) - addtrap "rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST;" + local COMPAREFILE1="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile1" + local COMPAREFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile2" + local COMPAREAGAINST="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.compareagainst" echo "$1" > $COMPAREFILE1 echo "$2" > $COMPAREFILE2 shift 2 @@ -1029,8 +1025,7 @@ N: Can't select versions from package '$1' as it is purely virtual" msgtest "Test for virtual packages" "apt-cache show $PACKAGE" VIRTUAL="${VIRTUAL} N: No packages found" - local COMPAREFILE=$(mktemp) - addtrap "rm $COMPAREFILE;" + local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testshowvirtual.comparefile" local ARCH="$(getarchitecture 'native')" echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail @@ -1073,8 +1068,7 @@ testdpkgnotinstalled() { } testmarkedauto() { - local COMPAREFILE=$(mktemp) - addtrap "rm $COMPAREFILE;" + local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedauto.comparefile" if [ -n "$1" ]; then msgtest 'Test for correctly marked as auto-installed' "$*" while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE @@ -1091,8 +1085,7 @@ testsuccess() { else msgtest 'Test for successful execution of' "$*" fi - local OUTPUT=$(mktemp) - addtrap "rm $OUTPUT;" + local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" if $@ >${OUTPUT} 2>&1; then msgpass else @@ -1108,8 +1101,7 @@ testfailure() { else msgtest 'Test for failure in execution of' "$*" fi - local OUTPUT=$(mktemp) - addtrap "rm $OUTPUT;" + local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" if $@ >${OUTPUT} 2>&1; then echo cat $OUTPUT -- cgit v1.2.3 From eb9dee9602941af8a62f619817f1956ce7363074 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 17 Jan 2014 19:37:45 +0100 Subject: ensure the right permissions as dpkg-deb ensists otherwise you get with pickier umasks errors like: dpkg-deb: error: control directory has bad permissions 700 (must be >=0755 and <=0775) so we just force a 755 for the control directory and dpkg is happy. Git-Dch: Ignore --- test/integration/framework | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration/framework b/test/integration/framework index bbe77dcf8..15c51e6ef 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -432,6 +432,8 @@ Package: $NAME" >> ${BUILDDIR}/debian/control (cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$arch) (cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums) local LOG="${BUILDDIR}/../${NAME}_${VERSION}_${arch}.dpkg-deb.log" + # ensure the right permissions as dpkg-deb ensists + chmod 755 ${BUILDDIR}/debian/tmp/DEBIAN if ! dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. >$LOG 2>&1; then cat $LOG false -- cgit v1.2.3 From 866e9fadf892368fcb50e6a192bcdd350cfe8e5c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jan 2014 20:41:55 +0100 Subject: implement suggestion by donkult (thanks!) --- apt-pkg/sourcelist.cc | 4 ++-- doc/sources.list.5.xml | 4 ++-- test/integration/test-apt-sources-deb822 | 2 +- test/libapt/sourcelist_test.cc | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 09d8287a0..51b766095 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -78,7 +78,7 @@ bool pkgSourceList::Type::ParseStanza(vector &List, { map Options; - string URI = Tags.FindS("Uri"); + string URI = Tags.FindS("URI"); if (!FixupURI(URI)) { _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); @@ -87,7 +87,7 @@ bool pkgSourceList::Type::ParseStanza(vector &List, // Define external/internal options const char* option_deb822[] = { - "Architectures", "Architectures-Add", "Architectures-Delete", "Trusted", + "Architectures", "Architectures-Add", "Architectures-Remove", "Trusted", }; const char* option_internal[] = { "arch", "arch+", "arch-", "trusted", diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e770023d5..7a82bd4ce 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -84,13 +84,13 @@ Alternatively a rfc822 style format is also supported: Type: deb - Uri: http://example.com + URI: http://example.com Suite: stable Section: component1 component2 [option1]: [option1-value] Type: deb-src - Uri: http://example.com + URI: http://example.com Suite: stable Section: component1 component2 [option1]: [option1-value] diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 67d119565..a055c8d5e 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -20,7 +20,7 @@ BASE="# some comment #Type: meep Type: deb -Uri: http://ftp.debian.org/debian +URI: http://ftp.debian.org/debian Suite: stable Section: main Comment: Some random string diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 1d30bd85b..6a625770f 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -23,14 +23,14 @@ int main(int argc, char *argv[]) { const char contents[] = "" "Type: deb\n" - "Uri: http://ftp.debian.org/debian\n" + "URI: http://ftp.debian.org/debian\n" "Suite: stable\n" "Section: main\n" "Comment: Some random string\n" " that can be very long\n" "\n" "Type: deb\n" - "Uri: http://ftp.debian.org/debian\n" + "URI: http://ftp.debian.org/debian\n" "Suite: unstable\n" "Section: main non-free\n" ; -- cgit v1.2.3 From 8a59cc322ac57c6662949e957611ed718a5f5119 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jan 2014 21:38:23 +0100 Subject: add purge to the apt cmdline --- cmdline/apt.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 8dc4c292a..61d5d938a 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -71,13 +71,16 @@ bool ShowHelp(CommandLine &CmdL) _("Usage: apt [options] command\n" "\n" "CLI for apt.\n" - "Commands: \n" + "Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" + "\n" " install - install packages\n" + " remove - remove packages\n" + "\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -103,6 +106,7 @@ int main(int argc, const char *argv[]) /*{{{*/ // needs root {"install",&DoInstall}, {"remove", &DoInstall}, + {"purge", &DoInstall}, {"update",&DoUpdate}, {"upgrade",&DoAptUpgrade}, // misc -- cgit v1.2.3 From 1290422a1074e59bf37241596d60e28afb76fb5c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 17 Jan 2014 22:43:42 +0100 Subject: get color/msglevel handling for tests in line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without a PTY attached do not use color, but use the same MSGLEVEL with or without a PTY. The level is better adjust via flags – especially as it is likely that without a PTY you want fullblown logs instead of the reduced display you get with -q otherwise. Git-Dch: Ignore --- test/integration/framework | 30 ++++++++++++++++++------------ test/integration/run-tests | 35 +++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 15c51e6ef..3ea9f3774 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -3,18 +3,24 @@ EXIT_CODE=0 # we all like colorful messages -if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \ - expr match "$(readlink -f /proc/$$/fd/2)" '/dev/pts/[0-9]\+' > /dev/null; then - CERROR="" # red - CWARNING="" # yellow - CMSG="" # green - CINFO="" # light blue - CDEBUG="" # blue - CNORMAL="" # default system console color - CDONE="" # green - CPASS="" # green - CFAIL="" # red - CCMD="" # pink +if [ "$MSGCOLOR" != 'NO' ]; then + if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then + export MSGCOLOR='NO' + fi +fi + + +if [ "$MSGCOLOR" != 'NO' ]; then + CERROR="\033[1;31m" # red + CWARNING="\033[1;33m" # yellow + CMSG="\033[1;32m" # green + CINFO="\033[1;96m" # light blue + CDEBUG="\033[1;94m" # blue + CNORMAL="\033[0;39m" # default system console color + CDONE="\033[1;32m" # green + CPASS="\033[1;32m" # green + CFAIL="\033[1;31m" # red + CCMD="\033[1;35m" # pink fi msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; } diff --git a/test/integration/run-tests b/test/integration/run-tests index 881c1c56b..79d5d1a29 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -7,22 +7,33 @@ ALL=0 FAILED_TESTS="" DIR=$(readlink -f $(dirname $0)) -if [ "$1" = "-q" ]; then - export MSGLEVEL=2 -elif [ "$1" = "-v" ]; then - export MSGLEVEL=4 -fi +while [ -n "$1" ]; do + if [ "$1" = "-q" ]; then + export MSGLEVEL=2 + elif [ "$1" = "-v" ]; then + export MSGLEVEL=4 + elif [ "$1" = '--color=no' ]; then + export MSGCOLOR='NO' + else + echo >&2 "WARNING: Unknown parameter »$1« will be ignored" + fi + shift +done +export MSGLEVEL="${MSGLEVEL:-3}" -if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then +if [ "$MSGCOLOR" != 'NO' ]; then + if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then + export MSGCOLOR='NO' + fi +fi +if [ "$MSGCOLOR" != 'NO' ]; then CTEST='\033[1;32m' CHIGH='\033[1;35m' CRESET='\033[0m' -elif [ -z "${MSGLEVEL}" ]; then - export MSGLEVEL=2 -fi - -if [ -z "$MSGLEVEL" ]; then - MSGLEVEL=5 +else + CTEST='' + CHIGH='' + CRESET='' fi for testcase in $(run-parts --list $DIR | grep '/test-'); do -- cgit v1.2.3 From 6c069a2247781754bcc8574687cb98b493c6ab8a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 18 Jan 2014 20:51:03 +0100 Subject: rename "Suite/Section" to plural --- apt-pkg/sourcelist.cc | 4 ++-- doc/sources.list.5.xml | 10 +++++----- test/integration/test-apt-sources-deb822 | 6 +++--- test/libapt/sourcelist_test.cc | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 51b766095..4e580ba04 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -97,9 +97,9 @@ bool pkgSourceList::Type::ParseStanza(vector &List, Options[option_internal[j]] = Tags.FindS(option_deb822[j]); // now create one item per suite/section - string Suite = Tags.FindS("Suite"); + string Suite = Tags.FindS("Suites"); Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture")); - string const Section = Tags.FindS("Section"); + string const Section = Tags.FindS("Sections"); std::vector list_dist = StringSplit(Suite, " "); std::vector list_section = StringSplit(Section, " "); diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 7a82bd4ce..87f4d5fc5 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -20,7 +20,7 @@ &apt-email; &apt-product; - 2012-06-09T00:00:00Z + 2014-01-18T00:00:00Z @@ -85,14 +85,14 @@ Type: deb URI: http://example.com - Suite: stable - Section: component1 component2 + Suites: stable + Sections: component1 component2 [option1]: [option1-value] Type: deb-src URI: http://example.com - Suite: stable - Section: component1 component2 + Suites: stable + Sections: component1 component2 [option1]: [option1-value] diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index a055c8d5e..c73b942d4 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -21,8 +21,8 @@ BASE="# some comment Type: deb URI: http://ftp.debian.org/debian -Suite: stable -Section: main +Suites: stable +Sections: main Comment: Some random string that can be very long" @@ -70,7 +70,7 @@ testequalwithmsg "Invalid sources.list file gives proper error" "E: Malformed li E: The list of sources could not be read." aptget update --print-uris echo "Type: deb -Suite: stable +Suites: stable " > $SOURCES testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse) diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 6a625770f..ae5d11f66 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -24,8 +24,8 @@ int main(int argc, char *argv[]) const char contents[] = "" "Type: deb\n" "URI: http://ftp.debian.org/debian\n" - "Suite: stable\n" - "Section: main\n" + "Suites: stable\n" + "Sections: main\n" "Comment: Some random string\n" " that can be very long\n" "\n" -- cgit v1.2.3 From a1bf319a7911c372c80023435692f49c2e82fba6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 18 Jan 2014 21:10:58 +0100 Subject: * implement deb822 suggestions from donkult (thanks!): - rename "Dist" to "Suites" - rename "Section" to "Sections" - rename "Architectures-Delete" to "Architectures-Remove" - rename "Uri" to "URI" * add "apt list --manual-installed" * add "apt upgrade --dist" * add "apt purge" * flock() the file edited in "apt edit-sources" * apt-private/private-show.cc: - do not show Description-lang: header * reword apt !isatty() warning * add missing integration test for "apt list" and fix bugs found by it --- debian/changelog | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0df4157fe..42ccb2703 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +apt (0.9.14.3~exp2ubuntu1) UNRELEASED; urgency=low + + * implement deb822 suggestions from donkult (thanks!): + - rename "Dist" to "Suites" + - rename "Section" to "Sections" + - rename "Architectures-Delete" to "Architectures-Remove" + - rename "Uri" to "URI" + * add "apt list --manual-installed" + * add "apt upgrade --dist" + * add "apt purge" + * flock() the file edited in "apt edit-sources" + * apt-private/private-show.cc: + - do not show Description-lang: header + * reword apt !isatty() warning + * add missing integration test for "apt list" and fix bugs + found by it + + -- Michael Vogt Sat, 18 Jan 2014 21:09:24 +0100 + apt (0.9.14.3~exp2) experimental; urgency=medium [ Julian Andres Klode ] -- cgit v1.2.3 From 609bb2ead3adef6e56daac1d12a9bdc482a4ae77 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 18 Jan 2014 21:12:40 +0100 Subject: releasing package apt version 0.9.14.3~exp3 --- configure.ac | 2 +- debian/changelog | 4 +- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 144 ++++++++++++++++++++++---------------- doc/po/de.po | 193 +++++++++++++++++++++++++++++++++------------------ doc/po/es.po | 193 +++++++++++++++++++++++++++++++++------------------ doc/po/fr.po | 193 +++++++++++++++++++++++++++++++++------------------ doc/po/it.po | 193 +++++++++++++++++++++++++++++++++------------------ doc/po/ja.po | 193 +++++++++++++++++++++++++++++++++------------------ doc/po/pl.po | 193 +++++++++++++++++++++++++++++++++------------------ doc/po/pt.po | 193 +++++++++++++++++++++++++++++++++------------------ doc/po/pt_BR.po | 154 +++++++++++++++++++++++----------------- po/ar.po | 171 +++++++++++++++++++++------------------------ po/ast.po | 189 +++++++++++++++++++++++++------------------------ po/bg.po | 189 +++++++++++++++++++++++++------------------------ po/bs.po | 171 +++++++++++++++++++++------------------------ po/ca.po | 189 +++++++++++++++++++++++++------------------------ po/cs.po | 189 +++++++++++++++++++++++++------------------------ po/cy.po | 171 +++++++++++++++++++++------------------------ po/da.po | 190 +++++++++++++++++++++++++------------------------- po/de.po | 190 +++++++++++++++++++++++++------------------------- po/dz.po | 171 +++++++++++++++++++++------------------------ po/el.po | 171 +++++++++++++++++++++------------------------ po/es.po | 189 +++++++++++++++++++++++++------------------------ po/eu.po | 171 +++++++++++++++++++++------------------------ po/fi.po | 171 +++++++++++++++++++++------------------------ po/fr.po | 189 +++++++++++++++++++++++++------------------------ po/gl.po | 189 +++++++++++++++++++++++++------------------------ po/hu.po | 189 +++++++++++++++++++++++++------------------------ po/it.po | 189 +++++++++++++++++++++++++------------------------ po/ja.po | 189 +++++++++++++++++++++++++------------------------ po/km.po | 171 +++++++++++++++++++++------------------------ po/ko.po | 189 +++++++++++++++++++++++++------------------------ po/ku.po | 171 +++++++++++++++++++++------------------------ po/lt.po | 171 +++++++++++++++++++++------------------------ po/mr.po | 171 +++++++++++++++++++++------------------------ po/nb.po | 189 +++++++++++++++++++++++++------------------------ po/ne.po | 171 +++++++++++++++++++++------------------------ po/nl.po | 189 +++++++++++++++++++++++++------------------------ po/nn.po | 171 +++++++++++++++++++++------------------------ po/pl.po | 189 +++++++++++++++++++++++++------------------------ po/pt.po | 189 +++++++++++++++++++++++++------------------------ po/pt_BR.po | 171 +++++++++++++++++++++------------------------ po/ro.po | 171 +++++++++++++++++++++------------------------ po/ru.po | 189 +++++++++++++++++++++++++------------------------ po/sk.po | 189 +++++++++++++++++++++++++------------------------ po/sl.po | 189 +++++++++++++++++++++++++------------------------ po/sv.po | 189 +++++++++++++++++++++++++------------------------ po/th.po | 184 ++++++++++++++++++++++++------------------------ po/tl.po | 171 +++++++++++++++++++++------------------------ po/tr.po | 190 +++++++++++++++++++++++++------------------------- po/uk.po | 189 +++++++++++++++++++++++++------------------------ po/vi.po | 189 ++++++++++++++++++++++++------------------------- po/zh_CN.po | 181 ++++++++++++++++++++++++----------------------- po/zh_TW.po | 171 +++++++++++++++++++++------------------------ 55 files changed, 4863 insertions(+), 4605 deletions(-) diff --git a/configure.ac b/configure.ac index eefb454d7..8c6810511 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.14.3~exp1" +PACKAGE_VERSION="0.9.14.3~exp3" 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 42ccb2703..b140cd7cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -apt (0.9.14.3~exp2ubuntu1) UNRELEASED; urgency=low +apt (0.9.14.3~exp3) experimental; urgency=low - * implement deb822 suggestions from donkult (thanks!): + * implement deb822 suggestions by donkult (thanks!): - rename "Dist" to "Suites" - rename "Section" to "Sections" - rename "Architectures-Delete" to "Architectures-Remove" diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 8d6131d58..47763c4c1 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 9c612e994..039e07a24 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.14.2\n" +"Project-Id-Version: apt-doc 0.9.14.3~exp3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1132,7 +1132,7 @@ msgid "Files" msgstr "" #. type: Content of: -#: 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:258 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609 +#: 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:275 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609 msgid "See Also" msgstr "" @@ -3624,7 +3624,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 apt-ftparchive.1.xml:598 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 apt-ftparchive.1.xml:598 msgid "Examples" msgstr "" @@ -4695,35 +4695,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 +#: sources.list.5.xml:82 #, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder " +"type=\"literallayout\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:100 msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 +#: sources.list.5.xml:109 msgid "" -"<literal>distribution</literal> may also contain a variable, " +"<literal>suite</literal> may also contain a variable, " "<literal>$(ARCH)</literal> which expands to the Debian architecture (such as " "<literal>amd64</literal> or <literal>armel</literal>) used on the " "system. This permits architecture-independent " @@ -4733,22 +4758,23 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 +#: sources.list.5.xml:117 msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -4759,7 +4785,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> " "can be used to specify for which architectures information should be " @@ -4768,7 +4794,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 msgid "" "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> " "and " @@ -4778,7 +4804,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the " @@ -4790,7 +4816,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -4799,12 +4825,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -4814,17 +4840,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -4832,7 +4858,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media " "swapping. Use the &apt-cdrom; program to create cdrom entries in the source " @@ -4840,7 +4866,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format " @@ -4851,7 +4877,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual " @@ -4864,7 +4890,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -4873,7 +4899,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -4882,12 +4908,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme " @@ -4899,42 +4925,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -4942,7 +4968,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -4950,33 +4976,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -4985,19 +5011,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under " @@ -5009,7 +5035,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 8983abb64..dad4c3f33 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+0100\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1572,7 +1572,7 @@ 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-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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 msgid "See Also" @@ -5210,7 +5210,7 @@ msgstr "" "filename> gelesenen Anbieter aus." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Beispiele" @@ -6697,7 +6697,7 @@ msgstr "" "benötigt, um Quellindizes herunterzuladen." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -6706,21 +6706,57 @@ msgstr "" "<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 -#, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#: sources.list.5.xml:82 +#, fuzzy, no-wrap +#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]" +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:100 +#, fuzzy +#| msgid "" +#| "The URI for the <literal>deb</literal> type must specify the base of the " +#| "Debian distribution, from which APT will find the information it needs. " +#| "<literal>distribution</literal> can specify an exact path, in which case " +#| "the components must be omitted and <literal>distribution</literal> must " +#| "end with a slash (<literal>/</literal>). This is useful for the case when " +#| "only a particular sub-section of the archive denoted by the URI is of " +#| "interest. If <literal>distribution</literal> does not specify an exact " +#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" "Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-" @@ -6734,15 +6770,24 @@ msgstr "" "angegeben sein." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 -msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +#: sources.list.5.xml:109 +#, fuzzy +#| msgid "" +#| "<literal>distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (such as " +#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +#| "This permits architecture-independent <filename>sources.list</filename> " +#| "files to be used. In general this is only of interest when specifying an " +#| "exact path, <literal>APT</literal> will automatically generate a URI with " +#| "the current architecture otherwise." +msgid "" +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> könnte außerdem eine Variable, <literal>" "$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " @@ -6754,18 +6799,32 @@ msgstr "" "Architektur generieren." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 -msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +#: sources.list.5.xml:117 +#, fuzzy +#| msgid "" +#| "Since only one distribution can be specified per line it may be necessary " +#| "to have multiple lines for the same URI, if a subset of all available " +#| "distributions or components at that location is desired. APT will sort " +#| "the URI list after it has generated a complete set internally, and will " +#| "collapse multiple references to the same Internet host, for instance, " +#| "into a single connection, so that it does not inefficiently establish an " +#| "FTP connection, close it, do something else, and then re-establish a " +#| "connection to that same host. This feature is useful for accessing busy " +#| "FTP sites with limits on the number of simultaneous anonymous users. APT " +#| "also parallelizes connections to different hosts to more effectively deal " +#| "with sites with low bandwidth." +msgid "" +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" "Da pro Zeile nur eine Distribution angegeben werden kann, könnte es nötig " "sein, mehrere Zeilen für die gleiche URI zu haben, falls eine Untermenge " @@ -6781,7 +6840,7 @@ msgstr "" "niedriger Bandbreite hauszuhalten." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6799,7 +6858,7 @@ msgstr "" "stillschweigend ignoriert werden." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6815,7 +6874,7 @@ msgstr "" "heruntergeladen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6837,7 +6896,7 @@ msgstr "" "heruntergeladen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6855,7 +6914,7 @@ msgstr "" "korrekt authentifizierte Quellen als nicht authentifiziert." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6869,12 +6928,12 @@ msgstr "" "Rechnern, zum Beispiel)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "Einige Beispiele:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6886,17 +6945,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "URI-Beschreibung" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "Die derzeit zulässigen URI-Typen sind:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6907,7 +6966,7 @@ msgstr "" "lokale Spiegel oder Archive." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6917,7 +6976,7 @@ msgstr "" "der Quellenliste zu erstellen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6934,7 +6993,7 @@ msgstr "" "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6956,7 +7015,7 @@ msgstr "" "benutzen, werden ignoriert." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6969,7 +7028,7 @@ msgstr "" "Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6983,12 +7042,12 @@ msgstr "" "<command>find</command> und <command>dd</command> verwandt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "weitere zulässige URI-Typen hinzufügen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7007,7 +7066,7 @@ msgstr "" "Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7016,37 +7075,37 @@ msgstr "" "jason/debian für stable/main, stable/contrib und stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution " "benutzt." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "Quellzeile für obiges" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7057,7 +7116,7 @@ msgstr "" "<literal>amd64</literal> und <literal>armel</literal> holt." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7067,7 +7126,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7076,13 +7135,13 @@ msgstr "" "den hamm/main-Bereich zu benutzen." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7092,13 +7151,13 @@ msgstr "" "benutzen." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7112,19 +7171,19 @@ msgstr "" "für beide Quellzeilen benutzt." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7144,7 +7203,7 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/es.po b/doc/po/es.po index c26c9476b..9debc5967 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: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -1648,7 +1648,7 @@ 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-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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 msgid "See Also" @@ -5240,7 +5240,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Ejemplos" @@ -6721,7 +6721,7 @@ msgstr "" "literal> para obtener los índices de fuentes." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -6730,21 +6730,57 @@ msgstr "" "usando los tipos <literal>deb</literal> y <literal>deb-src</literal> es:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 -#, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#: sources.list.5.xml:82 +#, fuzzy, no-wrap +#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]" +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:100 +#, fuzzy +#| msgid "" +#| "The URI for the <literal>deb</literal> type must specify the base of the " +#| "Debian distribution, from which APT will find the information it needs. " +#| "<literal>distribution</literal> can specify an exact path, in which case " +#| "the components must be omitted and <literal>distribution</literal> must " +#| "end with a slash (<literal>/</literal>). This is useful for the case when " +#| "only a particular sub-section of the archive denoted by the URI is of " +#| "interest. If <literal>distribution</literal> does not specify an exact " +#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" "El URI para el tipo <literal>deb</literal> debe especificar la base de la " @@ -6757,15 +6793,24 @@ msgstr "" "<literal>distribución</literal> no define una ruta exacta." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 -msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +#: sources.list.5.xml:109 +#, fuzzy +#| msgid "" +#| "<literal>distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (such as " +#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +#| "This permits architecture-independent <filename>sources.list</filename> " +#| "files to be used. In general this is only of interest when specifying an " +#| "exact path, <literal>APT</literal> will automatically generate a URI with " +#| "the current architecture otherwise." +msgid "" +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribución</literal> puede contener una variable, <literal>" "$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el " @@ -6777,18 +6822,32 @@ msgstr "" "sistema." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 -msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +#: sources.list.5.xml:117 +#, fuzzy +#| msgid "" +#| "Since only one distribution can be specified per line it may be necessary " +#| "to have multiple lines for the same URI, if a subset of all available " +#| "distributions or components at that location is desired. APT will sort " +#| "the URI list after it has generated a complete set internally, and will " +#| "collapse multiple references to the same Internet host, for instance, " +#| "into a single connection, so that it does not inefficiently establish an " +#| "FTP connection, close it, do something else, and then re-establish a " +#| "connection to that same host. This feature is useful for accessing busy " +#| "FTP sites with limits on the number of simultaneous anonymous users. APT " +#| "also parallelizes connections to different hosts to more effectively deal " +#| "with sites with low bandwidth." +msgid "" +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" "Debido a que sólo se puede especificar una distribución por línea, es " "posible que se precisen varias líneas para la misma URI si desea tener " @@ -6803,7 +6862,7 @@ msgstr "" "aprovechar mejor el ancho de banda." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6820,7 +6879,7 @@ msgstr "" "ignoran silenciosamente):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6835,7 +6894,7 @@ msgstr "" "arquitecturas definidas por la opción <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6856,7 +6915,7 @@ msgstr "" "arquitecturas definidas por la opción <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6874,7 +6933,7 @@ msgstr "" "autenticadas no lo están." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6887,12 +6946,12 @@ msgstr "" "seguidos por servidores de Internet distantes, por ejemplo)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "Algunos ejemplos:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6904,17 +6963,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "Especificación del URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "Los tipos de URI permitidos actualmente son:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6925,7 +6984,7 @@ msgstr "" "particiones montadas mediante NFS y réplicas o archivos de paquetes locales." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6935,7 +6994,7 @@ msgstr "" "list»." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6953,7 +7012,7 @@ msgstr "" "autenticación no es seguro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6974,7 +7033,7 @@ msgstr "" "fichero de configuración." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6987,7 +7046,7 @@ msgstr "" "permite realizar la copia de ficheros con APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -7001,12 +7060,12 @@ msgstr "" "transferencia de ficheros desde la máquina remota." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "Añadir más tipos de URI reconocidos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7025,7 +7084,7 @@ msgstr "" "debtorrent, consulte &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7034,36 +7093,36 @@ msgstr "" "para «stable/main», «stable/contrib», y «stable/non-free»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Como arriba, excepto que usa la distribución «unstable» (en desarrollo)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "Línea para obtener el código fuente desde la ubicación anterior." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7074,7 +7133,7 @@ msgstr "" "obtiene <literal>amd64</literal> y <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7084,7 +7143,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7093,13 +7152,13 @@ msgstr "" "usa sólo la sección «hamm/main»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7108,13 +7167,13 @@ msgstr "" "del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7127,19 +7186,19 @@ msgstr "" "filename>, se usará sólo una sesión FTP para ambas." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7158,7 +7217,7 @@ msgstr "" "tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/fr.po b/doc/po/fr.po index 67a26a280..de8e83d68 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: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -1567,7 +1567,7 @@ 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-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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 msgid "See Also" @@ -5196,7 +5196,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Exemples" @@ -6666,7 +6666,7 @@ msgstr "" "pour récupérer les index des sources." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -6675,21 +6675,57 @@ msgstr "" "types <literal>deb</literal> et <literal>deb-src</literal> est :" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 -#, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#: sources.list.5.xml:82 +#, fuzzy, no-wrap +#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]" +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:100 +#, fuzzy +#| msgid "" +#| "The URI for the <literal>deb</literal> type must specify the base of the " +#| "Debian distribution, from which APT will find the information it needs. " +#| "<literal>distribution</literal> can specify an exact path, in which case " +#| "the components must be omitted and <literal>distribution</literal> must " +#| "end with a slash (<literal>/</literal>). This is useful for the case when " +#| "only a particular sub-section of the archive denoted by the URI is of " +#| "interest. If <literal>distribution</literal> does not specify an exact " +#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" "L'URI de type <literal>deb</literal> doit indiquer la base de la " @@ -6703,15 +6739,24 @@ msgstr "" "être présent." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 -msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +#: sources.list.5.xml:109 +#, fuzzy +#| msgid "" +#| "<literal>distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (such as " +#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +#| "This permits architecture-independent <filename>sources.list</filename> " +#| "files to be used. In general this is only of interest when specifying an " +#| "exact path, <literal>APT</literal> will automatically generate a URI with " +#| "the current architecture otherwise." +msgid "" +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> peut aussi contenir une variable <literal>" "$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme " @@ -6722,18 +6767,32 @@ msgstr "" "literal> crée automatiquement un URI en fonction de l'architecture effective." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 -msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +#: sources.list.5.xml:117 +#, fuzzy +#| msgid "" +#| "Since only one distribution can be specified per line it may be necessary " +#| "to have multiple lines for the same URI, if a subset of all available " +#| "distributions or components at that location is desired. APT will sort " +#| "the URI list after it has generated a complete set internally, and will " +#| "collapse multiple references to the same Internet host, for instance, " +#| "into a single connection, so that it does not inefficiently establish an " +#| "FTP connection, close it, do something else, and then re-establish a " +#| "connection to that same host. This feature is useful for accessing busy " +#| "FTP sites with limits on the number of simultaneous anonymous users. APT " +#| "also parallelizes connections to different hosts to more effectively deal " +#| "with sites with low bandwidth." +msgid "" +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" "Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut être " "nécessaire de disposer le même URI sur plusieurs lignes quand on veut " @@ -6748,7 +6807,7 @@ msgstr "" "tirer plus efficacement parti des sites à faible bande passante." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6765,7 +6824,7 @@ msgstr "" "ignorés silencieusement) :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6780,7 +6839,7 @@ msgstr "" "Architectures</literal> sera téléchargée." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6801,7 +6860,7 @@ msgstr "" "Architectures</literal> sera téléchargée." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6819,7 +6878,7 @@ msgstr "" "authentifiées comme non authentifiées." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6832,12 +6891,12 @@ msgstr "" "les hôtes distants." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "Exemples :" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6849,17 +6908,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "Spécification des URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "Les types d'URI actuellement reconnues sont :" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6870,7 +6929,7 @@ msgstr "" "avec les montages NFS, les miroirs et les archives locaux." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6880,7 +6939,7 @@ msgstr "" "pour créer des entrées dans la liste des sources." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6897,7 +6956,7 @@ msgstr "" "Notez qu'il s'agit d'une méthode d'authentification peu sûre." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6919,7 +6978,7 @@ msgstr "" "configuration seront ignorés." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6933,7 +6992,7 @@ msgstr "" "des fichiers avec APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6947,12 +7006,12 @@ msgstr "" "sont utilisées pour l'accès aux fichiers de la machine distante." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "ajout de types d'URI supplémentaires reconnues" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -6971,7 +7030,7 @@ msgstr "" "disponibles (voir &apt-transport-debtorrent;)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -6980,37 +7039,37 @@ msgstr "" "debian pour stable/main, stable/contrib et stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Comme ci-dessus, excepté que cette ligne utilise la distribution " "« unstable » (développement)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "La précédente ligne, mais pour les sources." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7021,7 +7080,7 @@ msgstr "" "<literal>amd64</literal> et <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7031,7 +7090,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7040,13 +7099,13 @@ msgstr "" "n'utiliser que la section hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7055,13 +7114,13 @@ msgstr "" "répertoire debian, et n'utiliser que la section &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7074,19 +7133,19 @@ msgstr "" "apparaissent, une seule session FTP sera utilisée pour les deux lignes." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7106,7 +7165,7 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/it.po b/doc/po/it.po index 13818f98d..042abbc0b 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: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -1611,7 +1611,7 @@ 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-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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 msgid "See Also" @@ -5215,7 +5215,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Esempi" @@ -6703,7 +6703,7 @@ msgstr "" "riga <literal>deb-src</literal>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -6712,21 +6712,57 @@ msgstr "" "<literal>deb</literal> o <literal>deb-src</literal> è:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 -#, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#: sources.list.5.xml:82 +#, fuzzy, no-wrap +#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" msgstr "deb [ opzioni ] uri distribuzione [componente1] [componente2] [...]" +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:100 +#, fuzzy +#| msgid "" +#| "The URI for the <literal>deb</literal> type must specify the base of the " +#| "Debian distribution, from which APT will find the information it needs. " +#| "<literal>distribution</literal> can specify an exact path, in which case " +#| "the components must be omitted and <literal>distribution</literal> must " +#| "end with a slash (<literal>/</literal>). This is useful for the case when " +#| "only a particular sub-section of the archive denoted by the URI is of " +#| "interest. If <literal>distribution</literal> does not specify an exact " +#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" "L'URI per il tipo <literal>deb</literal> deve specificare la base della " @@ -6740,15 +6776,24 @@ msgstr "" "<literal>componente</literal>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 -msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +#: sources.list.5.xml:109 +#, fuzzy +#| msgid "" +#| "<literal>distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (such as " +#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +#| "This permits architecture-independent <filename>sources.list</filename> " +#| "files to be used. In general this is only of interest when specifying an " +#| "exact path, <literal>APT</literal> will automatically generate a URI with " +#| "the current architecture otherwise." +msgid "" +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribuzione</literal> può anche contenere una variabile <literal>" "$(ARCH)</literal> che viene espansa nell'architettura Debian (come " @@ -6759,18 +6804,32 @@ msgstr "" "automaticamente un URI con l'architettura corrente." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 -msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +#: sources.list.5.xml:117 +#, fuzzy +#| msgid "" +#| "Since only one distribution can be specified per line it may be necessary " +#| "to have multiple lines for the same URI, if a subset of all available " +#| "distributions or components at that location is desired. APT will sort " +#| "the URI list after it has generated a complete set internally, and will " +#| "collapse multiple references to the same Internet host, for instance, " +#| "into a single connection, so that it does not inefficiently establish an " +#| "FTP connection, close it, do something else, and then re-establish a " +#| "connection to that same host. This feature is useful for accessing busy " +#| "FTP sites with limits on the number of simultaneous anonymous users. APT " +#| "also parallelizes connections to different hosts to more effectively deal " +#| "with sites with low bandwidth." +msgid "" +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" "Dato che può essere specificata solo una distribuzione per riga, può essere " "necessario avere più righe per lo stesso URI, se si desidera un sottoinsieme " @@ -6786,7 +6845,7 @@ msgstr "" "larghezza di banda." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6803,7 +6862,7 @@ msgstr "" "supportate verranno ignorate in modo silenzioso):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6818,7 +6877,7 @@ msgstr "" "Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6839,7 +6898,7 @@ msgstr "" "Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6856,7 +6915,7 @@ msgstr "" "tratta anche le fonti correttamente autenticate come non autenticate." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6869,12 +6928,12 @@ msgstr "" "in una rete locale, seguiti da host Internet distanti)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "Alcuni esempi:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6886,17 +6945,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "Specificare URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "I tipi di URI attualmente riconosciuti sono:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6907,7 +6966,7 @@ msgstr "" "archivi locali." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6917,7 +6976,7 @@ msgstr "" "delle fonti." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6934,7 +6993,7 @@ msgstr "" "è un metodo di autenticazione non sicuro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6954,7 +7013,7 @@ msgstr "" "HTTP specificati nel file di configurazione verranno ignorati." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6967,7 +7026,7 @@ msgstr "" "rimovibili, per copiare i file nelle varie posizioni con APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6981,12 +7040,12 @@ msgstr "" "command> e <command>dd</command>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "aggiungere ulteriori tipi di URI riconoscibili" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7005,7 +7064,7 @@ msgstr "" "debtorrrent; vedere &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7014,37 +7073,37 @@ msgstr "" "debian per stable/main, stable/contrib e stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/gianni/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Come sopra, tranne per il fatto che usa la distribuzione unstable (di " "sviluppo)" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/gianni/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "Riga per i sorgenti corrispondente alla precedente" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7055,7 +7114,7 @@ msgstr "" "<literal>amd64</literal> e <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7065,7 +7124,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7074,13 +7133,13 @@ msgstr "" "hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7089,13 +7148,13 @@ msgstr "" "e usa solo l'area &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7108,19 +7167,19 @@ msgstr "" "usata una sola sessione FTP per entrambe le righe." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7139,7 +7198,7 @@ msgstr "" "modo.] <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/ja.po b/doc/po/ja.po index d73f29523..f877f2935 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: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -1559,7 +1559,7 @@ 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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 msgid "See Also" @@ -4978,7 +4978,7 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "サンプル" @@ -6412,7 +6412,7 @@ msgstr "" "です。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -6422,21 +6422,57 @@ msgstr "" "ます。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 -#, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#: sources.list.5.xml:82 +#, fuzzy, no-wrap +#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コンポーネント2] [...]" +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:100 +#, fuzzy +#| msgid "" +#| "The URI for the <literal>deb</literal> type must specify the base of the " +#| "Debian distribution, from which APT will find the information it needs. " +#| "<literal>distribution</literal> can specify an exact path, in which case " +#| "the components must be omitted and <literal>distribution</literal> must " +#| "end with a slash (<literal>/</literal>). This is useful for the case when " +#| "only a particular sub-section of the archive denoted by the URI is of " +#| "interest. If <literal>distribution</literal> does not specify an exact " +#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" "<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう" @@ -6449,15 +6485,24 @@ msgstr "" "とつは <literal>component</literal> を指定しなければなりません。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 -msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +#: sources.list.5.xml:109 +#, fuzzy +#| msgid "" +#| "<literal>distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (such as " +#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +#| "This permits architecture-independent <filename>sources.list</filename> " +#| "files to be used. In general this is only of interest when specifying an " +#| "exact path, <literal>APT</literal> will automatically generate a URI with " +#| "the current architecture otherwise." +msgid "" +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合" "があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian " @@ -6468,18 +6513,32 @@ msgstr "" "チャで URI を自動的に生成します。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 -msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +#: sources.list.5.xml:117 +#, fuzzy +#| msgid "" +#| "Since only one distribution can be specified per line it may be necessary " +#| "to have multiple lines for the same URI, if a subset of all available " +#| "distributions or components at that location is desired. APT will sort " +#| "the URI list after it has generated a complete set internally, and will " +#| "collapse multiple references to the same Internet host, for instance, " +#| "into a single connection, so that it does not inefficiently establish an " +#| "FTP connection, close it, do something else, and then re-establish a " +#| "connection to that same host. This feature is useful for accessing busy " +#| "FTP sites with limits on the number of simultaneous anonymous users. APT " +#| "also parallelizes connections to different hosts to more effectively deal " +#| "with sites with low bandwidth." +msgid "" +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" "有効な全 distribution, component の場所から、一部が必要な場合、1 行につき 1 " "distribution しか指定できないため、同じ URI の行を複数記述することになるで" @@ -6491,7 +6550,7 @@ msgstr "" "るホストへは、接続を並行して行うようにもしています。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6507,7 +6566,7 @@ msgstr "" "す)。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6521,7 +6580,7 @@ msgstr "" "literal> オプションに定義してある、全アーキテクチャをダウンロードします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6541,7 +6600,7 @@ msgstr "" "literal> オプションに定義してある、全アーキテクチャをダウンロードします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6558,7 +6617,7 @@ msgstr "" "認証として扱います。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6571,12 +6630,12 @@ msgstr "" "しょう。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "例:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6588,17 +6647,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "URI の仕様" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "現在認識できる URI タイプは以下のとおりです。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6608,7 +6667,7 @@ msgstr "" "にします。これは NFS マウントやローカルミラーで便利です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6618,7 +6677,7 @@ msgstr "" "グラムを使用してください。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6634,7 +6693,7 @@ msgstr "" "指定してください。この認証方法は安全ではないことに注意してください。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6653,7 +6712,7 @@ msgstr "" "す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6665,7 +6724,7 @@ msgstr "" "用していて、APT でコピーを行う場合に便利です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6679,12 +6738,12 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "さらに認識できる URI タイプの追加" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -6702,7 +6761,7 @@ msgstr "" "transport-debtorrent; を参照してください。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -6711,35 +6770,35 @@ msgstr "" "free 用のローカル (または NFS) アーカイブを使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "上記と同様ですが、不安定版 (開発版) を使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "上記のソース行は以下のようになります。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -6750,7 +6809,7 @@ msgstr "" "<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -6760,7 +6819,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -6769,13 +6828,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -6784,13 +6843,13 @@ msgstr "" "&stable-codename;/contrib のみを使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -6803,19 +6862,19 @@ msgstr "" "つだけになります。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -6834,7 +6893,7 @@ msgstr "" "<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/pl.po b/doc/po/pl.po index 4b0f8d89c..5d66ac29c 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: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -1642,7 +1642,7 @@ 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-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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 msgid "See Also" @@ -4644,7 +4644,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Przykłady" @@ -6118,7 +6118,7 @@ msgstr "" "źródłowych." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -6127,21 +6127,57 @@ msgstr "" "<literal>deb</literal> i <literal>deb-src</literal> jest następujący:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 -#, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#: sources.list.5.xml:82 +#, fuzzy, no-wrap +#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]" +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:100 +#, fuzzy +#| msgid "" +#| "The URI for the <literal>deb</literal> type must specify the base of the " +#| "Debian distribution, from which APT will find the information it needs. " +#| "<literal>distribution</literal> can specify an exact path, in which case " +#| "the components must be omitted and <literal>distribution</literal> must " +#| "end with a slash (<literal>/</literal>). This is useful for the case when " +#| "only a particular sub-section of the archive denoted by the URI is of " +#| "interest. If <literal>distribution</literal> does not specify an exact " +#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" "URI typu <literal>deb</literal> musi podawać bazową lokalizację dystrybucji " @@ -6154,15 +6190,24 @@ msgstr "" "<literal>komponent</literal>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 -msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +#: sources.list.5.xml:109 +#, fuzzy +#| msgid "" +#| "<literal>distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (such as " +#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +#| "This permits architecture-independent <filename>sources.list</filename> " +#| "files to be used. In general this is only of interest when specifying an " +#| "exact path, <literal>APT</literal> will automatically generate a URI with " +#| "the current architecture otherwise." +msgid "" +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</" "literal>, która zostanie rozwinięta do architektury Debiana (takiej jak " @@ -6174,18 +6219,32 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 -msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +#: sources.list.5.xml:117 +#, fuzzy +#| msgid "" +#| "Since only one distribution can be specified per line it may be necessary " +#| "to have multiple lines for the same URI, if a subset of all available " +#| "distributions or components at that location is desired. APT will sort " +#| "the URI list after it has generated a complete set internally, and will " +#| "collapse multiple references to the same Internet host, for instance, " +#| "into a single connection, so that it does not inefficiently establish an " +#| "FTP connection, close it, do something else, and then re-establish a " +#| "connection to that same host. This feature is useful for accessing busy " +#| "FTP sites with limits on the number of simultaneous anonymous users. APT " +#| "also parallelizes connections to different hosts to more effectively deal " +#| "with sites with low bandwidth." +msgid "" +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" "Ponieważ w pojedynczej linii można podać tylko jedną dystrybucję, może być " "potrzebne wymienienie tego samego URI w wielu liniach, jeżeli pożądany jest " @@ -6201,7 +6260,7 @@ msgstr "" "sieciach o niskiej przepustowości łączy." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6218,7 +6277,7 @@ msgstr "" "wypisywania żadnego ostrzeżenia):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6233,7 +6292,7 @@ msgstr "" "w opcji konfiguracji <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6254,7 +6313,7 @@ msgstr "" "w opcji konfiguracji <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6272,7 +6331,7 @@ msgstr "" "niezautentykowane." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6286,12 +6345,12 @@ msgstr "" "komputerami w Internecie)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "Kilka przykładów:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6303,17 +6362,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "Określanie URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "Obecnie rozpoznawane są następujące typy URI:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6324,7 +6383,7 @@ msgstr "" "archiwów." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6334,7 +6393,7 @@ msgstr "" "list." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6351,7 +6410,7 @@ msgstr "" "bezpieczny." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6371,7 +6430,7 @@ msgstr "" "konfiguracyjnym serwery proxy używające HTTP zostaną zignorowane." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6384,7 +6443,7 @@ msgstr "" "do skopiowania plików przy użyciu APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6398,12 +6457,12 @@ msgstr "" "przetransferowania plików ze zdalnego komputera." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "dodawanie innych rozpoznawanych typów URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -6422,7 +6481,7 @@ msgstr "" "zobaczyć &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -6431,36 +6490,36 @@ msgstr "" "debian dla zasobów stable/main, stable/contrib i stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "Linie źródeł dla powyższego przykładu" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -6471,7 +6530,7 @@ msgstr "" "literal> i <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -6481,7 +6540,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -6490,13 +6549,13 @@ msgstr "" "org i dystrybucji hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -6505,13 +6564,13 @@ msgstr "" "katalogu debian i używa tylko dystrybucji &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -6524,19 +6583,19 @@ msgstr "" "to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -6555,7 +6614,7 @@ msgstr "" "nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache;, &apt-conf;" diff --git a/doc/po/pt.po b/doc/po/pt.po index 7060351ce..c9a325bf0 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: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -1595,7 +1595,7 @@ 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-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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 msgid "See Also" @@ -5163,7 +5163,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Exemplos" @@ -6639,7 +6639,7 @@ msgstr "" "linha <literal>deb-src</literal> para obter índices das fontes." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -6648,21 +6648,57 @@ msgstr "" "tipos <literal>deb</literal> e <literal>deb-src</literal> é:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 -#, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#: sources.list.5.xml:82 +#, fuzzy, no-wrap +#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]" +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:100 +#, fuzzy +#| msgid "" +#| "The URI for the <literal>deb</literal> type must specify the base of the " +#| "Debian distribution, from which APT will find the information it needs. " +#| "<literal>distribution</literal> can specify an exact path, in which case " +#| "the components must be omitted and <literal>distribution</literal> must " +#| "end with a slash (<literal>/</literal>). This is useful for the case when " +#| "only a particular sub-section of the archive denoted by the URI is of " +#| "interest. If <literal>distribution</literal> does not specify an exact " +#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" "O URI para o tipo <literal>deb</literal> tem de especificar a base da " @@ -6676,15 +6712,24 @@ msgstr "" "presente." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 -msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +#: sources.list.5.xml:109 +#, fuzzy +#| msgid "" +#| "<literal>distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (such as " +#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +#| "This permits architecture-independent <filename>sources.list</filename> " +#| "files to be used. In general this is only of interest when specifying an " +#| "exact path, <literal>APT</literal> will automatically generate a URI with " +#| "the current architecture otherwise." +msgid "" +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" "<literal>distribution</literal> também pode conter uma variável. <literal>" "$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como " @@ -6695,18 +6740,32 @@ msgstr "" "gerar automaticamente um URI com a arquitectura actual." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 -msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +#: sources.list.5.xml:117 +#, fuzzy +#| msgid "" +#| "Since only one distribution can be specified per line it may be necessary " +#| "to have multiple lines for the same URI, if a subset of all available " +#| "distributions or components at that location is desired. APT will sort " +#| "the URI list after it has generated a complete set internally, and will " +#| "collapse multiple references to the same Internet host, for instance, " +#| "into a single connection, so that it does not inefficiently establish an " +#| "FTP connection, close it, do something else, and then re-establish a " +#| "connection to that same host. This feature is useful for accessing busy " +#| "FTP sites with limits on the number of simultaneous anonymous users. APT " +#| "also parallelizes connections to different hosts to more effectively deal " +#| "with sites with low bandwidth." +msgid "" +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" "Como apenas pode ser especificada por linha uma distribuição, pode ser " "necessário ter várias linhas para o mesmo URI, se só for desejado um sub-" @@ -6721,7 +6780,7 @@ msgstr "" "sites com baixa largura de banda." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6738,7 +6797,7 @@ msgstr "" "definições não suportadas serão ignoradas em silêncio):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6753,7 +6812,7 @@ msgstr "" "<literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6774,7 +6833,7 @@ msgstr "" "<literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6791,7 +6850,7 @@ msgstr "" "lida com fontes mesmo actualmente autenticadas como não sendo autênticas." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6805,12 +6864,12 @@ msgstr "" "Internet, por exemplo)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 msgid "Some examples:" msgstr "Alguns exemplos:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6822,17 +6881,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "Especificação da URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "Os tipos de URI actualmente reconhecidos são:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6843,7 +6902,7 @@ msgstr "" "arquivos locais." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6853,7 +6912,7 @@ msgstr "" "fontes." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6870,7 +6929,7 @@ msgstr "" "método de autenticação seguro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6891,7 +6950,7 @@ msgstr "" "configuração serão ignorados." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6904,7 +6963,7 @@ msgstr "" "ficheiros com o APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6918,12 +6977,12 @@ msgstr "" "ficheiros a partir da máquina remota." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "adicionando mais tipos de URI reconhecíveis" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -6942,7 +7001,7 @@ msgstr "" "exemplo o debtorrent - veja &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -6951,36 +7010,36 @@ msgstr "" "para stable/main, stable/contrib, e stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "Linha de fonte para o referido acima" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -6991,7 +7050,7 @@ msgstr "" "<literal>amd64</literal> e <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7001,7 +7060,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7010,13 +7069,13 @@ msgstr "" "hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7025,13 +7084,13 @@ msgstr "" "usa apenas a área &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7044,19 +7103,19 @@ msgstr "" "uma única sessão FTP para ambas linhas de recurso." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7075,7 +7134,7 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index a77b8319a..695d8dbea 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: 2013-12-29 17:01+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -1120,7 +1120,7 @@ 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:258 +#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 #: apt-ftparchive.1.xml:609 #, fuzzy @@ -3615,7 +3615,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 #: apt-ftparchive.1.xml:598 #, fuzzy msgid "Examples" @@ -5096,60 +5096,86 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:80 +#: sources.list.5.xml:79 msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:83 +#: sources.list.5.xml:82 #, no-wrap -msgid "deb [ options ] uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri suite [component1] [component2] [...]" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:86 +#, no-wrap +msgid "" +" Type: deb\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +"\n" +" Type: deb-src\n" +" URI: http://example.com\n" +" Suites: stable\n" +" Sections: component1 component2\n" +" [option1]: [option1-value]\n" +" " msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:85 +#: sources.list.5.xml:84 +msgid "" +"Alternatively a rfc822 style format is also supported: <placeholder type=" +"\"literallayout\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:100 msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " -"<literal>distribution</literal> can specify an exact path, in which case the " -"components must be omitted and <literal>distribution</literal> must end with " -"a slash (<literal>/</literal>). This is useful for the case when only a " +"<literal>suite</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>suite</literal> must end with a " +"slash (<literal>/</literal>). This is useful for the case when only a " "particular sub-section of the archive denoted by the URI is of interest. If " -"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>suite</literal> does not specify an exact path, at least one " "<literal>component</literal> must be present." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:94 +#: sources.list.5.xml:109 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>" -"$(ARCH)</literal> which expands to the Debian architecture (such as " -"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -"This permits architecture-independent <filename>sources.list</filename> " -"files to be used. In general this is only of interest when specifying an " -"exact path, <literal>APT</literal> will automatically generate a URI with " -"the current architecture otherwise." +"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" +"literal> which expands to the Debian architecture (such as <literal>amd64</" +"literal> or <literal>armel</literal>) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be used. " +"In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:102 +#: sources.list.5.xml:117 msgid "" -"Since only one distribution can be specified per line it may be necessary to " -"have multiple lines for the same URI, if a subset of all available " -"distributions or components at that location is desired. APT will sort the " -"URI list after it has generated a complete set internally, and will collapse " -"multiple references to the same Internet host, for instance, into a single " -"connection, so that it does not inefficiently establish an FTP connection, " -"close it, do something else, and then re-establish a connection to that same " -"host. This feature is useful for accessing busy FTP sites with limits on the " -"number of simultaneous anonymous users. APT also parallelizes connections to " -"different hosts to more effectively deal with sites with low bandwidth." +"In the traditional style sources.list format since only one distribution can " +"be specified per line it may be necessary to have multiple lines for the " +"same URI, if a subset of all available distributions or components at that " +"location is desired. APT will sort the URI list after it has generated a " +"complete set internally, and will collapse multiple references to the same " +"Internet host, for instance, into a single connection, so that it does not " +"inefficiently establish an FTP connection, close it, do something else, and " +"then re-establish a connection to that same host. This feature is useful for " +"accessing busy FTP sites with limits on the number of simultaneous anonymous " +"users. APT also parallelizes connections to different hosts to more " +"effectively deal with sites with low bandwidth." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:114 +#: sources.list.5.xml:131 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -5160,7 +5186,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:120 +#: sources.list.5.xml:137 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -5170,7 +5196,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:141 msgid "" "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>," @@ -5179,7 +5205,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:144 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -5190,7 +5216,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:134 +#: sources.list.5.xml:151 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -5199,13 +5225,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:156 #, fuzzy msgid "Some examples:" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:141 +#: sources.list.5.xml:158 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -5214,17 +5240,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:147 +#: sources.list.5.xml:164 msgid "URI specification" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:149 +#: sources.list.5.xml:166 msgid "The currently recognized URI types are:" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:153 +#: sources.list.5.xml:170 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -5232,14 +5258,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:160 +#: sources.list.5.xml:177 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:167 +#: sources.list.5.xml:184 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -5250,7 +5276,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:178 +#: sources.list.5.xml:195 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -5263,7 +5289,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:190 +#: sources.list.5.xml:207 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -5272,7 +5298,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:197 +#: sources.list.5.xml:214 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -5281,12 +5307,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:204 +#: sources.list.5.xml:221 msgid "adding more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:223 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -5298,42 +5324,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:218 +#: sources.list.5.xml:235 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:237 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:239 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:240 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:242 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:226 +#: sources.list.5.xml:243 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:228 +#: sources.list.5.xml:245 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -5341,7 +5367,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:247 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -5349,33 +5375,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:233 +#: sources.list.5.xml:250 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:235 +#: sources.list.5.xml:252 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:237 +#: sources.list.5.xml:254 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:239 +#: sources.list.5.xml:256 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:241 +#: sources.list.5.xml:258 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -5384,19 +5410,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:245 +#: sources.list.5.xml:262 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:254 +#: sources.list.5.xml:271 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:247 +#: sources.list.5.xml:264 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -5408,7 +5434,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:259 +#: sources.list.5.xml:276 #, fuzzy msgid "&apt-cache; &apt-conf;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/po/ar.po b/po/ar.po index 2eac4a7c9..df852f62f 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -104,7 +104,7 @@ msgstr "" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "لم يُعثر على أية حزم" @@ -592,13 +592,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -635,11 +638,11 @@ msgid "File not found" msgstr "لم يُعثر على الملف" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -714,9 +717,9 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "خطأ في الكتابة" @@ -970,7 +973,7 @@ msgstr "فشل الاتصال" msgid "Internal error" msgstr "خطأ داخلي" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1203,101 +1206,101 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟" msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " أو" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1305,27 +1308,27 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" @@ -1334,7 +1337,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[Y/n]" @@ -1342,21 +1345,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1414,7 +1417,7 @@ msgstr "تمّ" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1426,12 +1429,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "فشل تغيير اسم %s إلى %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1477,8 +1480,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1516,20 +1519,6 @@ msgstr "فشل إغلاق الملف %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -2506,86 +2495,86 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:348 -#, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2797,35 +2786,35 @@ msgstr "الحجم غير متطابق" msgid "Invalid file format" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2833,24 +2822,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ast.po b/po/ast.po index 8492dc7ce..06a3a5987 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -97,7 +97,7 @@ msgstr "El ficheru de paquetes %s nun ta sincronizáu." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Nun s'alcontraron paquetes" @@ -698,13 +698,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -741,11 +744,11 @@ msgid "File not found" msgstr "Nun s'atopa'l ficheru." #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -820,9 +823,9 @@ msgstr "Una rempuesta revirtió'l buffer." msgid "Protocol corruption" msgstr "Corrupción del protocolu" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Fallu d'escritura" @@ -1079,7 +1082,7 @@ msgstr "Fallo la conexón" msgid "Internal error" msgstr "Fallu internu" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1325,101 +1328,101 @@ msgstr "¿Instalar esos paquetes ensin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " o" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1427,27 +1430,27 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" @@ -1456,7 +1459,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[S/n]" @@ -1464,21 +1467,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" @@ -1536,7 +1539,7 @@ msgstr "Fecho" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1553,12 +1556,12 @@ msgstr "" " asina que nun dependen de la pertinencia de la verdadera situación " "actual!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nun pudo renomase %s como %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1604,8 +1607,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1643,24 +1646,6 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el " -"parche parez corruptu." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Nun pudo parchease %s con mmap (pero nun ye un fallu especificu de mmap) - " -"el parche parez corruptu." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" @@ -2720,89 +2705,89 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinia %u enforma llarga na llista d'oríxenes %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3024,35 +3009,35 @@ msgstr "El tamañu nun concasa" msgid "Invalid file format" msgstr "Operación incorreuta: %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3062,12 +3047,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3076,12 +3061,12 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3509,6 +3494,20 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiáu" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el " +#~ "parche parez corruptu." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nun pudo parchease %s con mmap (pero nun ye un fallu especificu de mmap) " +#~ "- el parche parez corruptu." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Nota, escoyendo '%s' pa la xera '%s'\n" diff --git a/po/bg.po b/po/bg.po index a8e7a975f..649a0a66a 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -103,7 +103,7 @@ msgstr "Пакетният файл %s не е синхронизиран." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Няма намерени пакети" @@ -724,13 +724,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -767,11 +770,11 @@ msgid "File not found" msgstr "Файлът не е намерен" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -846,9 +849,9 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Грешка при запис" @@ -1110,7 +1113,7 @@ msgstr "Неуспех при свързването" msgid "Internal error" msgstr "Вътрешна грешка" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1358,101 +1361,101 @@ msgstr "Инсталиране на тези пакети без проверк msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " или" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1460,27 +1463,27 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" @@ -1489,7 +1492,7 @@ msgstr "%lu не са напълно инсталирани или премах #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[Y/n]" @@ -1497,21 +1500,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -1571,7 +1574,7 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1587,12 +1590,12 @@ msgstr "" " Заключването е деактивирано, така че не разчитайте\n" " на повтаряемост в реална ситуация." -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Неуспех при преименуването на %s на %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1638,8 +1641,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1677,24 +1680,6 @@ msgstr "Грешка при четене файла „%s“ от огледал msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда " -"повредена." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Неуспех при закърпване на %s с mmap (без грешка, специфична за mmap) – " -"кръпката изглежда повредена." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" @@ -2758,93 +2743,93 @@ msgstr "Неуспех при анализирането на пакетен ф msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма " "стойност)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3076,7 +3061,7 @@ msgstr "Несъответствие на размера" msgid "Invalid file format" msgstr "Невалидна операция %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3085,16 +3070,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3103,12 +3088,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3118,12 +3103,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3132,12 +3117,12 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3566,6 +3551,20 @@ msgstr "" msgid "Not locked" msgstr "Без заключване" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда " +#~ "повредена." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Неуспех при закърпване на %s с mmap (без грешка, специфична за mmap) – " +#~ "кръпката изглежда повредена." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Избиране на %s за задача „%s“\n" diff --git a/po/bs.po b/po/bs.po index 56edfca9a..a7c3886c1 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -100,7 +100,7 @@ msgstr "" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Paketi nisu pronađeni" @@ -598,13 +598,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -641,11 +644,11 @@ msgid "File not found" msgstr "Datoteka nije pronađena" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "" @@ -719,9 +722,9 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Greška pri pisanju" @@ -976,7 +979,7 @@ msgstr "Povezivanje neuspješno" msgid "Internal error" msgstr "Unutrašnja greška" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1203,128 +1206,128 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ali nije instaliran" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ili" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "" -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1333,7 +1336,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1341,21 +1344,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1412,7 +1415,7 @@ msgstr "Urađeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1424,12 +1427,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Ne mogu otvoriti %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1472,8 +1475,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1511,20 +1514,6 @@ msgstr "Ne mogu otvoriti %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -2501,86 +2490,86 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:348 -#, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2790,35 +2779,35 @@ msgstr "" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2826,24 +2815,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ca.po b/po/ca.po index f9b274516..d2d5d26ec 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -100,7 +100,7 @@ msgstr "El fitxer %s del paquet està desincronitzat." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "No s'han trobat paquets" @@ -709,13 +709,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -752,11 +755,11 @@ msgid "File not found" msgstr "Fitxer no trobat" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -831,9 +834,9 @@ msgstr "Una resposta ha desbordat la memòria intermèdia." msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error d'escriptura" @@ -1095,7 +1098,7 @@ msgstr "Ha fallat la connexió" msgid "Internal error" msgstr "Error intern" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1348,101 +1351,101 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " o" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1450,27 +1453,27 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" @@ -1479,7 +1482,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[S/n]" @@ -1487,21 +1490,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -1559,7 +1562,7 @@ msgstr "Fet" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1575,12 +1578,12 @@ msgstr "" " Tingueu en ment que el bloqueig està desactivat,\n" " per tant, no es depèn de la situació actual real." -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "No s'ha pogut canviar el nom de %s a %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1626,8 +1629,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1665,24 +1668,6 @@ msgstr "No es pot llegir el fitxer rèplica «%s»" msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació " -"del fitxer - el pedaç sembla ser incorrecte" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error " -"específic del mmap) - el pedaç sembla ser incorrecte" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" @@ -2743,89 +2728,89 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3058,7 +3043,7 @@ msgstr "La mida no concorda" msgid "Invalid file format" msgstr "Operació no vàlida %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3067,16 +3052,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3085,12 +3070,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3101,12 +3086,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3116,12 +3101,12 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3550,6 +3535,20 @@ msgstr "" msgid "Not locked" msgstr "No blocat" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la " +#~ "operació del fitxer - el pedaç sembla ser incorrecte" + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error " +#~ "específic del mmap) - el pedaç sembla ser incorrecte" + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Nota: s'està seleccionant «%s» per a la tasca «%s»\n" diff --git a/po/cs.po b/po/cs.po index a94899a6c..941306b86 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -99,7 +99,7 @@ msgstr "Soubor balíku %s je špatně synchronizovaný." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" @@ -706,13 +706,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -749,11 +752,11 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -828,9 +831,9 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Chyba zápisu" @@ -1086,7 +1089,7 @@ msgstr "Spojení selhalo" msgid "Internal error" msgstr "Vnitřní chyba" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1336,101 +1339,101 @@ msgstr "Instalovat tyto balíky bez ověření?" msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " nebo" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1438,27 +1441,27 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" @@ -1467,7 +1470,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[Y/n]" @@ -1475,21 +1478,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -1547,7 +1550,7 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1563,12 +1566,12 @@ msgstr "" " Mějte také na paměti, že je vypnuto zamykání, tudíž\n" " tyto výsledky nemusí mít s realitou nic společného!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Selhalo přejmenování %s na %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1614,8 +1617,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1653,24 +1656,6 @@ msgstr "Nelze číst soubor se zrcadly „%s“" msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je " -"záplata porušená." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Nelze záplatovat %s pomocí mmapu (ovšem žádná chyba specifická pro mmap " -"nebyla zaznamenána) - zdá se, že je záplata porušená." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" @@ -2717,86 +2702,86 @@ msgstr "Nelze zpracovat soubor %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3017,7 +3002,7 @@ msgstr "Velikosti nesouhlasí" msgid "Invalid file format" msgstr "Neplatná operace %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3026,16 +3011,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3044,12 +3029,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3059,12 +3044,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3073,12 +3058,12 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento " "balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3493,6 +3478,20 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „% msgid "Not locked" msgstr "Není uzamčen" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je " +#~ "záplata porušená." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nelze záplatovat %s pomocí mmapu (ovšem žádná chyba specifická pro mmap " +#~ "nebyla zaznamenána) - zdá se, že je záplata porušená." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Pozn: vybírám „%s“ pro úlohu „%s“\n" diff --git a/po/cy.po b/po/cy.po index c65e9850e..1d924b05e 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -113,7 +113,7 @@ msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Canfuwyd dim pecyn" @@ -712,13 +712,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -759,11 +762,11 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -839,9 +842,9 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1105,7 +1108,7 @@ msgstr "Methodd y cysylltiad" msgid "Internal error" msgstr "Gwall mewnol" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1350,104 +1353,104 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1457,27 +1460,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1486,7 +1489,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1494,21 +1497,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1567,7 +1570,7 @@ msgstr "Wedi Gorffen" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1579,12 +1582,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Methwyd ailenwi %s at %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1630,8 +1633,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1669,20 +1672,6 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" @@ -2760,91 +2749,91 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3076,7 +3065,7 @@ msgstr "Camgyfatebiaeth maint" msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3084,28 +3073,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3113,13 +3102,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3128,12 +3117,12 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/da.po b/po/da.po index 1ef8a5b1f..cd2a76ef6 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "Pakkefilen %s er ude af trit." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Fandt ingen pakker" @@ -716,17 +716,21 @@ msgstr "" "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information." #: cmdline/apt.cc:71 +#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -776,11 +780,11 @@ msgid "File not found" msgstr "Fil blev ikke fundet" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -855,9 +859,9 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefejl" @@ -1119,7 +1123,7 @@ msgid "Internal error" msgstr "Intern fejl" # måske visning, kategorisering -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "Listing" @@ -1365,98 +1369,98 @@ msgstr "Installér disse pakker uden verifikation?" msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "installeret,kan opgraderes til: " -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 msgid "[installed,local]" msgstr "[Installeret,lokalt]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 msgid "[installed,automatic]" msgstr "[Installeret,automatisk]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 msgid "[installed]" msgstr "[Installeret]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "[kan opgraderes fra: " -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "[residual-konfig]" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1464,27 +1468,27 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" @@ -1493,7 +1497,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[J/n]" @@ -1501,21 +1505,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -1572,7 +1576,7 @@ msgstr "Færdig" msgid "Full Text Search" msgstr "Fuldtekst-søgning" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "ikke en reel pakke (virtuel)" @@ -1588,12 +1592,12 @@ msgstr "" " Husk også at låsning er deaktiveret,\n" " så stol ikke på relevansen for den reelle aktuelle situation!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, c-format msgid "Failed to parse %s. Edit again? " msgstr "Kunne ikke fortolke %s. Rediger igen? " -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«." @@ -1639,8 +1643,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1678,24 +1682,6 @@ msgstr "Ingen post fundet i spejlfil »%s«" msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - " -"fejlrettelsen ser ud til at være ødelagt." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - " -"fejlrettelsen ser ud til at være ødelagt." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" @@ -2749,86 +2735,86 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Åbner %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3052,7 +3038,7 @@ msgstr "Størrelsen stemmer ikke" msgid "Invalid file format" msgstr "Ugyldigt filformat" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3061,17 +3047,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3080,12 +3066,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3095,12 +3081,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3109,12 +3095,12 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3526,3 +3512,17 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet." #: apt-pkg/deb/debsystem.cc:121 msgid "Not locked" msgstr "Ikke låst" + +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - " +#~ "fejlrettelsen ser ud til at være ødelagt." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - " +#~ "fejlrettelsen ser ud til at være ødelagt." diff --git a/po/de.po b/po/de.po index c411905f1..10bca6f83 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "Paketdatei %s ist nicht synchronisiert." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Keine Pakete gefunden" @@ -741,13 +741,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -787,11 +790,11 @@ msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -866,9 +869,9 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Schreibfehler" @@ -1138,7 +1141,7 @@ msgstr "Verbindung fehlgeschlagen" msgid "Internal error" msgstr "Interner Fehler" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1391,102 +1394,102 @@ msgstr "Diese Pakete ohne Überprüfung installieren?" msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Installiert]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Installiert]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Installiert]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " oder" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1494,27 +1497,27 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" @@ -1523,7 +1526,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[J/n]" @@ -1531,21 +1534,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -1603,7 +1606,7 @@ msgstr "Fertig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1620,12 +1623,12 @@ msgstr "" " sind, verlassen Sie sich also bezüglich des reellen aktuellen\n" " Status der Sperre nicht darauf!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s konnte nicht in %s umbenannt werden." -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1671,8 +1674,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1710,24 +1713,6 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf %s " -"angewendet werden - der Patch scheint beschädigt zu sein." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch nichts " -"mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt zu sein." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -2803,87 +2788,87 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet." -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3124,7 +3109,7 @@ msgstr "Größe stimmt nicht überein" msgid "Invalid file format" msgstr "Ungültige Operation %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3133,17 +3118,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3152,12 +3137,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3168,12 +3153,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3183,14 +3168,14 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3622,6 +3607,21 @@ msgstr "" msgid "Not locked" msgstr "Nicht gesperrt" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf " +#~ "%s angewendet werden - der Patch scheint beschädigt zu sein." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch " +#~ "nichts mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt " +#~ "zu sein." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Hinweis: »%s« wird für Task »%s« gewählt.\n" diff --git a/po/dz.po b/po/dz.po index 55d894505..fcd13c1a3 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -104,7 +104,7 @@ msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་ #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།" @@ -690,13 +690,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -734,11 +737,11 @@ msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -813,9 +816,9 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -1074,7 +1077,7 @@ msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོ msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1317,101 +1320,101 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr "ཡང་ན།" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1419,27 +1422,27 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" @@ -1448,7 +1451,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1456,21 +1459,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "ཝའི།" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -1528,7 +1531,7 @@ msgstr "འབད་ཚར་ཡི།" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1540,12 +1543,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1591,8 +1594,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1630,20 +1633,6 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" @@ -2704,86 +2693,86 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3005,35 +2994,35 @@ msgstr "ཚད་མ་མཐུན།" msgid "Invalid file format" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3041,12 +3030,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3055,12 +3044,12 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/el.po b/po/el.po index 49e368859..4ad135c9c 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -110,7 +110,7 @@ msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμέ #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" @@ -702,13 +702,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -745,11 +748,11 @@ msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -824,9 +827,9 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1088,7 +1091,7 @@ msgstr "Η σύνδεση απέτυχε" msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1335,101 +1338,101 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " η" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1437,27 +1440,27 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" @@ -1466,7 +1469,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[Ν/ο]" @@ -1474,21 +1477,21 @@ msgstr "[Ν/ο]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[ν/Ο]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -1548,7 +1551,7 @@ msgstr "Ετοιμο" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1560,12 +1563,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Αποτυχία μετονομασίας του %s σε %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1611,8 +1614,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1650,20 +1653,6 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" @@ -2727,86 +2716,86 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3034,35 +3023,35 @@ msgstr "Ανόμοιο μέγεθος" msgid "Invalid file format" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3070,12 +3059,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3084,12 +3073,12 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/es.po b/po/es.po index c1700c16b..7ae80ff02 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -155,7 +155,7 @@ msgstr "El archivo de paquetes %s está desincronizado." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "No se encontró ningún paquete" @@ -762,13 +762,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -805,11 +808,11 @@ msgid "File not found" msgstr "Fichero no encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -884,9 +887,9 @@ msgstr "No pude crear un socket." msgid "Protocol corruption" msgstr "Fallo del protocolo" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error de escritura" @@ -1145,7 +1148,7 @@ msgstr "Fallo la conexión" msgid "Internal error" msgstr "Error interno" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1399,101 +1402,101 @@ msgstr "¿Instalar estos paquetes sin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "pero no es instalable" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "pero no está instalado" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " o" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1501,27 +1504,27 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" @@ -1530,7 +1533,7 @@ msgstr "%lu no instalados del todo o eliminados.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[S/n]" @@ -1538,21 +1541,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -1610,7 +1613,7 @@ msgstr "Listo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1626,12 +1629,12 @@ msgstr "" " Tenga también en cuenta que se han desactivado los bloqueos,\n" " ¡no dependa de la relevancia a la situación real actual!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "No pude abrir %s.new" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1677,8 +1680,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1716,24 +1719,6 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "[Mirror: %s]" msgstr "[Réplica: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"No se pudo parchear %s con mmap y con el modo de uso de la operación de " -"ficheros - el paquete parece dañado." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"No se pudo parchear %s con mmap (pero no hay un fallo mmap específico) - el " -"parche parece dañado." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" @@ -2803,92 +2788,92 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene " "asociado un valor)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3119,37 +3104,37 @@ msgstr "El tamaño difiere" msgid "Invalid file format" msgstr "Operación inválida: %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3160,12 +3145,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3175,12 +3160,12 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3611,6 +3596,20 @@ msgstr "" msgid "Not locked" msgstr "No bloqueado" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "No se pudo parchear %s con mmap y con el modo de uso de la operación de " +#~ "ficheros - el paquete parece dañado." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "No se pudo parchear %s con mmap (pero no hay un fallo mmap específico) - " +#~ "el parche parece dañado." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Nota, seleccionando «%s» para la tarea «%s»\n" diff --git a/po/eu.po b/po/eu.po index 00c752628..b07f1a948 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -101,7 +101,7 @@ msgstr "%s pakete fitxategia ez dago sinkronizatuta." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Ez da paketerik aurkitu" @@ -689,13 +689,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -733,11 +736,11 @@ msgid "File not found" msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -814,9 +817,9 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Idazketa errorea" @@ -1075,7 +1078,7 @@ msgstr "Konexioak huts egin du" msgid "Internal error" msgstr "Barne errorea" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1325,101 +1328,101 @@ msgstr "Paketeak egiaztapen gabe instalatu?" msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " edo" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1427,27 +1430,27 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" @@ -1456,7 +1459,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[B/e]" @@ -1464,21 +1467,21 @@ msgstr "[B/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[b/E]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -1536,7 +1539,7 @@ msgstr "Eginda" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1548,12 +1551,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1599,8 +1602,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1638,20 +1641,6 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" @@ -2706,86 +2695,86 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3003,35 +2992,35 @@ msgstr "Tamaina ez dator bat" msgid "Invalid file format" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3039,12 +3028,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3053,12 +3042,12 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/fi.po b/po/fi.po index 087a5de48..958fc756c 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -101,7 +101,7 @@ msgstr "Pakettitiedosto %s ei ole ajan tasalla." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" @@ -684,13 +684,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -727,11 +730,11 @@ msgid "File not found" msgstr "Tiedostoa ei löydy" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -806,9 +809,9 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1067,7 +1070,7 @@ msgstr "Yhteys ei toiminut" msgid "Internal error" msgstr "Sisäinen virhe" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1317,101 +1320,101 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?" msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " tai" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1419,27 +1422,27 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" @@ -1448,7 +1451,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[K/e]" @@ -1456,21 +1459,21 @@ msgstr "[K/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "K" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -1528,7 +1531,7 @@ msgstr "Valmis" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1540,12 +1543,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1591,8 +1594,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1630,20 +1633,6 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" @@ -2697,86 +2686,86 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2994,35 +2983,35 @@ msgstr "Koko ei täsmää" msgid "Invalid file format" msgstr "Virheellinen toiminto %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3030,12 +3019,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3044,12 +3033,12 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/fr.po b/po/fr.po index 2a3614a30..64ce07802 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -101,7 +101,7 @@ msgstr "Fichier %s désynchronisé." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Aucun paquet n'a été trouvé" @@ -745,13 +745,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -790,11 +793,11 @@ msgid "File not found" msgstr "Fichier non trouvé" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -870,9 +873,9 @@ msgstr "Une réponse a fait déborder le tampon." msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erreur d'écriture" @@ -1137,7 +1140,7 @@ msgstr "Échec de la connexion" msgid "Internal error" msgstr "Erreur interne" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1399,101 +1402,101 @@ msgstr "Faut-il installer ces paquets sans vérification ?" msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Installé]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Installé]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Installé]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1502,27 +1505,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" @@ -1531,7 +1534,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[O/n]" @@ -1539,21 +1542,21 @@ msgstr "[O/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[o/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -1611,7 +1614,7 @@ msgstr "Fait" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1629,12 +1632,12 @@ msgstr "" " et la situation n'est donc pas forcément représentative\n" " de la réalité !" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Impossible de changer le nom %s en %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1680,8 +1683,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1719,24 +1722,6 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." msgid "[Mirror: %s]" msgstr "[Miroir : %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Impossible de modifier %s avec mmap et l'utilisation des opérations de " -"fichiers : le correctif semble être corrompu." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le " -"correctif semble être corrompu." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de créer le tube IPC sur le sous-processus" @@ -2810,98 +2795,98 @@ msgstr "Impossible de traiter le fichier %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser " "[option])" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une " "affectation)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de " "valeur)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3145,7 +3130,7 @@ msgstr "Taille incohérente" msgid "Invalid file format" msgstr "L'opération %s n'est pas valable" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3154,18 +3139,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3174,12 +3159,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3190,12 +3175,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3204,14 +3189,14 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3641,6 +3626,20 @@ msgstr "" msgid "Not locked" msgstr "Non verrouillé" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Impossible de modifier %s avec mmap et l'utilisation des opérations de " +#~ "fichiers : le correctif semble être corrompu." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le " +#~ "correctif semble être corrompu." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Note : sélection de %s pour la tâche « %s »\n" diff --git a/po/gl.po b/po/gl.po index 6c99e1d1e..57343335a 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -104,7 +104,7 @@ msgstr "O ficheiro de paquete %s está sen sincronizar." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Non se atopou ningún paquete" @@ -707,13 +707,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -750,11 +753,11 @@ msgid "File not found" msgstr "Non se atopou o ficheiro" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -829,9 +832,9 @@ msgstr "Unha resposta desbordou o búfer." msgid "Protocol corruption" msgstr "Dano no protocolo" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Produciuse un erro de escritura" @@ -1094,7 +1097,7 @@ msgstr "Produciuse un fallo na conexión" msgid "Internal error" msgstr "Produciuse un erro interno" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1349,101 +1352,101 @@ msgstr "Instalar estes paquetes sen verificación?" msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "mais non é instalábel" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "mais non está instalado" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1451,27 +1454,27 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" @@ -1480,7 +1483,7 @@ msgstr "%lu non instalados ou retirados de todo.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[S/n]" @@ -1488,21 +1491,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" @@ -1560,7 +1563,7 @@ msgstr "Feito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1577,12 +1580,12 @@ msgstr "" " Lembre tamén que o bloqueo está desactivado,\n" " polo que non debe depender da relevancia da situación actual real." -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Non foi posíbel cambiar o nome de %s a %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1628,8 +1631,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1667,24 +1670,6 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»" msgid "[Mirror: %s]" msgstr "[Replica: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - a " -"actualización semella estar danada." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Non foi posíbel actualizar %s con mmap e (mais non hai un fallo específico " -"de mmap) - a actualización semella estar danada." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" @@ -2750,90 +2735,90 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal construída na lista de orixes %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de orixes %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal construída na lista de orixes %s (tipo)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3060,7 +3045,7 @@ msgstr "Os tamaños non coinciden" msgid "Invalid file format" msgstr "Operación incorrecta: %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3069,29 +3054,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3102,12 +3087,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3116,12 +3101,12 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3554,6 +3539,20 @@ msgstr "" msgid "Not locked" msgstr "Non está bloqueado" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - " +#~ "a actualización semella estar danada." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Non foi posíbel actualizar %s con mmap e (mais non hai un fallo " +#~ "específico de mmap) - a actualización semella estar danada." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Nota, seleccione «%s» para a tarefa «%s»\n" diff --git a/po/hu.po b/po/hu.po index 014f95ad1..a70700de7 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -103,7 +103,7 @@ msgstr "%s csomagfájl nincs szinkronban." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Nem találhatók csomagok" @@ -722,13 +722,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -766,11 +769,11 @@ msgid "File not found" msgstr "A fájl nem található" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -847,9 +850,9 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokollhiba" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Írási hiba" @@ -1107,7 +1110,7 @@ msgstr "Sikertelen kapcsolódás" msgid "Internal error" msgstr "Belső hiba" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1354,101 +1357,101 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " vagy" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1456,27 +1459,27 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" @@ -1485,7 +1488,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[I/n]" @@ -1493,21 +1496,21 @@ msgstr "[I/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[i/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -1565,7 +1568,7 @@ msgstr "Kész" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1581,12 +1584,12 @@ msgstr "" " Ne feledje, hogy a zárolás is ki van kapcsolva,\n" " így ne számítson a jelenlegi helyzet valósságára!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "„%s” átnevezése sikertelen erre: %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1632,8 +1635,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1671,24 +1674,6 @@ msgstr "A(z) „%s” tükörfájl nem olvasható" msgid "[Mirror: %s]" msgstr "[Tükör: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek " -"tűnik." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"%s nem foltozható mmappel (nem mmap specifikus hiba) - a folt sérültnek " -"tűnik." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" @@ -2750,96 +2735,96 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] " "feldolgozhatatlan)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl " "rövid)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "érvényes hozzárendelés)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "tartalmaz kulcsot)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak " "nincs értéke)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3067,7 +3052,7 @@ msgstr "A méret nem megfelelő" msgid "Invalid file format" msgstr "%s érvénytelen művelet" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3076,16 +3061,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3094,12 +3079,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3109,12 +3094,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3123,12 +3108,12 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3548,6 +3533,20 @@ msgstr "" msgid "Not locked" msgstr "Nincs zárolva" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek " +#~ "tűnik." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s nem foltozható mmappel (nem mmap specifikus hiba) - a folt sérültnek " +#~ "tűnik." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Megjegyzés: „%s” kijelölése „%s” feladathoz\n" diff --git a/po/it.po b/po/it.po index f01aea6ba..6f0d90f13 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "Il file dei pacchetti %s non è sincronizzato." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Nessun pacchetto trovato" @@ -736,13 +736,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -779,11 +782,11 @@ msgid "File not found" msgstr "File non trovato" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -859,9 +862,9 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Errore di scrittura" @@ -1125,7 +1128,7 @@ msgstr "Connessione non riuscita" msgid "Internal error" msgstr "Errore interno" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1382,101 +1385,101 @@ msgstr "Installare questi pacchetti senza verificarli?" msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Installato]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Installato]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Installato]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ma non è installabile" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ma non è installato" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " oppure" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1485,27 +1488,27 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" @@ -1514,7 +1517,7 @@ msgstr "%lu non completamente installati o rimossi.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[S/n]" @@ -1522,21 +1525,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@ -1594,7 +1597,7 @@ msgstr "Eseguito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1610,12 +1613,12 @@ msgstr "" " Inoltre, il meccanismo di blocco non è attivato e non è quindi\n" " utile dare importanza a tutto ciò per una situazione reale." -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Rinomina di %s in %s non riuscita" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1662,8 +1665,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1701,24 +1704,6 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\"" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Impossibile applicare la patch a %s con mmap e con l'utilizzo di operazioni " -"file. La patch sembra essere danneggiata." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Impossibile applicare la patch a %s con mmap (nessun errore da parte di " -"mmap). La patch sembra essere danneggiata." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" @@ -2792,96 +2777,96 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file di pacchetto %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "La riga %lu nel file %s non è corretta (URI parse)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non " "analizzabile)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo " "corta)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è " "un'assegnazione)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una " "chiave)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non " "ha un valore)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La riga %lu nel file %s non è corretta (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La riga %lu nel file %s non è corretta (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La riga %lu nel file %s non è corretta (absolute dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La riga %lu nel file %s non è corretta (dist parse)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Apertura di %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riga %u troppo lunga nel file %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La riga %u nel file %s non è corretta (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "La riga %lu nel file %s non è corretta (URI parse)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3117,7 +3102,7 @@ msgstr "Le dimensioni non corrispondono" msgid "Invalid file format" msgstr "Operazione %s non valida" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3126,17 +3111,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3145,12 +3130,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3160,12 +3145,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3174,14 +3159,14 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3615,6 +3600,20 @@ msgstr "" msgid "Not locked" msgstr "Non bloccato" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Impossibile applicare la patch a %s con mmap e con l'utilizzo di " +#~ "operazioni file. La patch sembra essere danneggiata." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Impossibile applicare la patch a %s con mmap (nessun errore da parte di " +#~ "mmap). La patch sembra essere danneggiata." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n" diff --git a/po/ja.po b/po/ja.po index 75c762fb8..3ef58b94c 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -100,7 +100,7 @@ msgstr "Package ファイル %s が同期していません。" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "パッケージが見つかりません" @@ -726,13 +726,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -769,11 +772,11 @@ msgid "File not found" msgstr "ファイルが見つかりません" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -848,9 +851,9 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "書き込みエラー" @@ -1108,7 +1111,7 @@ msgstr "接続失敗" msgid "Internal error" msgstr "内部エラー" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1351,101 +1354,101 @@ msgstr "検証なしにこれらのパッケージをインストールします msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " または" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1453,27 +1456,27 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" @@ -1482,7 +1485,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除 #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[Y/n]" @@ -1490,21 +1493,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -1564,7 +1567,7 @@ msgstr "完了" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1580,12 +1583,12 @@ msgstr "" " ロックが非アクティブであることから、今この時点の状態に妥当性が\n" " あるとは言い切れないことに注意してください!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s を %s に名前変更できませんでした" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1631,8 +1634,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1670,24 +1673,6 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません" msgid "[Mirror: %s]" msgstr "[ミラー: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れてい" -"るようです。" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありません) - " -"パッチが壊れているようです。" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" @@ -2739,90 +2724,90 @@ msgstr "パッケージファイル %s を解釈することができません ( msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3052,7 +3037,7 @@ msgstr "サイズが適合しません" msgid "Invalid file format" msgstr "不正な操作 %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3061,16 +3046,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3079,14 +3064,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3096,12 +3081,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3110,12 +3095,12 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3540,6 +3525,20 @@ msgstr "" msgid "Not locked" msgstr "ロックされていません" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れて" +#~ "いるようです。" + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありませ" +#~ "ん) - パッチが壊れているようです。" + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "注意: タスク '%2$s' に対して '%1$s' を選択しています\n" diff --git a/po/km.po b/po/km.po index 46e41504b..e0944fa9f 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -105,7 +105,7 @@ msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "រក​កញ្ចប់​មិន​ឃើញ" @@ -682,13 +682,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -725,11 +728,11 @@ msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -803,9 +806,9 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" @@ -1060,7 +1063,7 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1299,101 +1302,101 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ឬ" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយ​សារតែ​ %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1401,27 +1404,27 @@ msgstr "" "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu ​ត្រូវបានបន្ទាប់ " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" @@ -1430,7 +1433,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1438,21 +1441,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" @@ -1510,7 +1513,7 @@ msgstr "ធ្វើរួច​" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1522,12 +1525,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1573,8 +1576,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1612,20 +1615,6 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" @@ -2676,86 +2665,86 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1 msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "កំពុង​បើក​ %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2973,35 +2962,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" msgid "Invalid file format" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3009,12 +2998,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3023,12 +3012,12 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ko.po b/po/ko.po index 76c37abde..f768cb179 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -97,7 +97,7 @@ msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "패키지가 없습니다" @@ -689,13 +689,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -732,11 +735,11 @@ msgid "File not found" msgstr "파일이 없습니다" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -811,9 +814,9 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "쓰기 오류" @@ -1068,7 +1071,7 @@ msgstr "연결이 실패했습니다" msgid "Internal error" msgstr "내부 오류" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1310,101 +1313,101 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까?" msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [설치함]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [설치함]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [설치함]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " 혹은" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1412,27 +1415,27 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" @@ -1441,7 +1444,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[Y/n]" @@ -1449,21 +1452,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -1522,7 +1525,7 @@ msgstr "완료" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1538,12 +1541,12 @@ msgstr "" " 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n" " 않도록 하십시오!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1589,8 +1592,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1628,24 +1631,6 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상된 것" -"처럼 보입니다." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"%s 패치를 mmap을 이용해 (mmap 관련 실패는 없음) 적용할 수 없습니다. 패치 파일" -"이 손상된 것처럼 보입니다." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" @@ -2696,87 +2681,87 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2996,35 +2981,35 @@ msgstr "크기가 맞지 않습니다" msgid "Invalid file format" msgstr "잘못된 작업 %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3034,12 +3019,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3048,12 +3033,12 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3464,6 +3449,20 @@ msgstr "" msgid "Not locked" msgstr "잠기지 않음" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상" +#~ "된 것처럼 보입니다." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s 패치를 mmap을 이용해 (mmap 관련 실패는 없음) 적용할 수 없습니다. 패치 " +#~ "파일이 손상된 것처럼 보입니다." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "주의, 작업 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n" diff --git a/po/ku.po b/po/ku.po index fb64505e3..fc762aff0 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -104,7 +104,7 @@ msgstr "Pakêta dosya %s li derveyî demê ye." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Pakêt nayên dîtin" @@ -604,13 +604,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -645,12 +648,12 @@ msgid "File not found" msgstr "Pel nehate dîtin" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "" @@ -723,9 +726,9 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Çewtiya nivîsînê" @@ -982,7 +985,7 @@ msgstr "Girêdan pêk nehatiye" msgid "Internal error" msgstr "Çewtiya hundirîn" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1208,127 +1211,127 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " û" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1337,7 +1340,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 #, fuzzy msgid "[Y/n]" msgstr "[E/n]" @@ -1346,21 +1349,21 @@ msgstr "[E/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1417,7 +1420,7 @@ msgstr "Temam" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1429,12 +1432,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s ji hev nehate veçirandin" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1477,8 +1480,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1516,20 +1519,6 @@ msgstr "Nikarî pelê %s veke" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -2519,86 +2508,86 @@ msgstr "Pakêt nehate dîtin %s" msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:348 -#, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2808,35 +2797,35 @@ msgstr "Mezinahî li hev nayên" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2844,24 +2833,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/lt.po b/po/lt.po index ea278bd13..46e7f2c13 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -103,7 +103,7 @@ msgstr "" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Paketų nerasta" @@ -608,13 +608,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -649,11 +652,11 @@ msgid "File not found" msgstr "Failas nerastas" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "" @@ -726,9 +729,9 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Rašymo klaida" @@ -982,7 +985,7 @@ msgstr "Prisijungti nepavyko" msgid "Internal error" msgstr "Vidinė klaida" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1220,101 +1223,101 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?" msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " arba" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1322,27 +1325,27 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" @@ -1351,7 +1354,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[T/n]" @@ -1359,21 +1362,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1432,7 +1435,7 @@ msgstr "Įvykdyta" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1444,12 +1447,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nepavyko pervadinti %s į %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1495,8 +1498,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1534,20 +1537,6 @@ msgstr "Nepavyko atverti failo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nepavyko subprocesui sukurti IPC gijos" @@ -2608,86 +2597,86 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Atveriama %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:348 -#, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2900,35 +2889,35 @@ msgstr "Neatitinka dydžiai" msgid "Invalid file format" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2936,24 +2925,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/mr.po b/po/mr.po index 838f3c67a..f77866298 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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 " @@ -99,7 +99,7 @@ msgstr "पॅकेज संचिका %s सिंक्रोनाइज #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "पॅकेजेस सापडले नाहीत" @@ -678,13 +678,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -721,11 +724,11 @@ msgid "File not found" msgstr "फाईल सापडली नाही" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -800,9 +803,9 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "लिहिण्यात त्रुटी" @@ -1058,7 +1061,7 @@ msgstr "जोडणी अयशस्वी" msgid "Internal error" msgstr "अंतर्गत त्रुटी" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1303,101 +1306,101 @@ msgstr "पडताळून पाहिल्याशिवाय ही प msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr "किंवा" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1405,27 +1408,27 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" @@ -1434,7 +1437,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1442,21 +1445,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "होय" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -1514,7 +1517,7 @@ msgstr "झाले" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1526,12 +1529,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1577,8 +1580,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1616,20 +1619,6 @@ msgstr "%s फाईल उघडता येत नाही" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" @@ -2680,86 +2669,86 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s उघडत आहे" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2981,35 +2970,35 @@ msgstr "आकार जुळतनाही" msgid "Invalid file format" msgstr "%s अवैध क्रिया" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3017,12 +3006,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3031,12 +3020,12 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/nb.po b/po/nb.po index 68aa842cc..bdd00052d 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ikke oppdatert." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Fant ingen pakker" @@ -693,13 +693,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -738,11 +741,11 @@ msgid "File not found" msgstr "Fant ikke fila" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -817,9 +820,9 @@ msgstr "Et svar oversvømte bufferen." msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefeil" @@ -1076,7 +1079,7 @@ msgstr "Forbindelsen mislykkes" msgid "Internal error" msgstr "Intern feil" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1324,101 +1327,101 @@ msgstr "Installer disse pakkene uten verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "men er ikke installert" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1426,27 +1429,27 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" @@ -1455,7 +1458,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[J/n]" @@ -1463,21 +1466,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -1535,7 +1538,7 @@ msgstr "Utført" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1551,12 +1554,12 @@ msgstr "" " Husk også at låsing er deaktivert, så ikke regn med \n" " relevans i forhold til den reelle gjeldende situasjonen." -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Klarte ikke å endre navnet på %s til %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1602,8 +1605,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1641,24 +1644,6 @@ msgstr "Ingen speilfil «%s» funnet" msgid "[Mirror: %s]" msgstr "[Speil: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen ser " -"ut til å være korrupt." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - " -"programrettelsen ser ut til å være korrupt." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" @@ -2714,86 +2699,86 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3014,36 +2999,36 @@ msgstr "Feil størrelse" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3053,12 +3038,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3067,12 +3052,12 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3491,6 +3476,20 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet," msgid "Not locked" msgstr "Ikke låst" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen " +#~ "ser ut til å være korrupt." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - " +#~ "programrettelsen ser ut til å være korrupt." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Merk, velger «%s» for oppgaven «%s»\n" diff --git a/po/ne.po b/po/ne.po index b6446a091..3d9ecee00 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "प्याकेज फाइल %s sync भन्दा बाहि #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "कुनै प्याकेजहरू फेला परेन" @@ -680,13 +680,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -723,11 +726,11 @@ msgid "File not found" msgstr "फाइल फेला परेन " #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -802,9 +805,9 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -1059,7 +1062,7 @@ msgstr "जडान असफल भयो" msgid "Internal error" msgstr "आन्तरिक त्रुटि" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1300,101 +1303,101 @@ msgstr "यी प्याकेजहरू रूजू बिना स् msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr "वा" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1402,27 +1405,27 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" @@ -1431,7 +1434,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1439,21 +1442,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -1511,7 +1514,7 @@ msgstr "काम भयो" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1523,12 +1526,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1574,8 +1577,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1613,20 +1616,6 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" @@ -2678,86 +2667,86 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2975,35 +2964,35 @@ msgstr "साइज मेल खाएन" msgid "Invalid file format" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3011,12 +3000,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3025,12 +3014,12 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/nl.po b/po/nl.po index 697892993..b9b9794ee 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -103,7 +103,7 @@ msgstr "Pakketbestand %s is niet meer gesynchroniseerd." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Geen pakketten gevonden" @@ -705,13 +705,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -749,11 +752,11 @@ msgid "File not found" msgstr "Bestand niet gevonden" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -828,9 +831,9 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Schrijffout" @@ -1093,7 +1096,7 @@ msgstr "Verbinding mislukt" msgid "Internal error" msgstr "Interne fout" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1344,101 +1347,101 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?" msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " of" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1446,27 +1449,27 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" @@ -1475,7 +1478,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[J/n]" @@ -1483,21 +1486,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -1555,7 +1558,7 @@ msgstr "Klaar" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1571,12 +1574,12 @@ msgstr "" " Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n" " vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Hernoemen van %s naar %s is mislukt" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1622,8 +1625,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1661,24 +1664,6 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt " -"beschadigd te zijn." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de patch " -"lijkt beschadigd te zijn." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" @@ -2748,87 +2733,87 @@ msgstr "Kon pakketbestand %s niet ontleden (1)" msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3061,36 +3046,36 @@ msgstr "Grootte komt niet overeen" msgid "Invalid file format" msgstr "Ongeldige operatie %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3101,12 +3086,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3115,12 +3100,12 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3550,6 +3535,20 @@ msgstr "" msgid "Not locked" msgstr "Niet vergrendeld" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt " +#~ "beschadigd te zijn." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de " +#~ "patch lijkt beschadigd te zijn." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Let op, '%s' wordt geselecteerd omwille van de taak '%s'\n" diff --git a/po/nn.po b/po/nn.po index b9f38e940..6ae106e38 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ute av takt." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Fann ingen pakkar" @@ -687,13 +687,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -732,11 +735,11 @@ msgid "File not found" msgstr "Fann ikkje fila" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -811,9 +814,9 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefeil" @@ -1068,7 +1071,7 @@ msgstr "Sambandet mislukkast" msgid "Internal error" msgstr "Intern feil" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1309,101 +1312,101 @@ msgstr "Installer desse pakkane utan verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "men er ikkje installert" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1412,27 +1415,27 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" @@ -1441,7 +1444,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[J/n]" @@ -1449,21 +1452,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -1522,7 +1525,7 @@ msgstr "Ferdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1534,12 +1537,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Klarte ikkje endra namnet p %s til %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1585,8 +1588,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1624,20 +1627,6 @@ msgstr "Klarte ikkje opna fila %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" @@ -2684,86 +2673,86 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2987,35 +2976,35 @@ msgstr "Feil storleik" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3023,12 +3012,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3037,12 +3026,12 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/pl.po b/po/pl.po index 29828df57..537f2b12c 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -105,7 +105,7 @@ msgstr "Plik pakietu %s jest przestarzały." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Nie znaleziono żadnych pakietów" @@ -732,13 +732,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -775,11 +778,11 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -856,9 +859,9 @@ msgstr "Odpowiedź przepełniła bufor." msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Błąd zapisu" @@ -1117,7 +1120,7 @@ msgstr "Połączenie nie powiodło się" msgid "Internal error" msgstr "Błąd wewnętrzny" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1381,101 +1384,101 @@ msgstr "Zainstalować te pakiety bez weryfikacji?" msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " lub" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1483,27 +1486,27 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" @@ -1512,7 +1515,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[T/n]" @@ -1520,21 +1523,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -1592,7 +1595,7 @@ msgstr "Gotowe" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1608,12 +1611,12 @@ msgstr "" " Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n" " na związku z rzeczywistą sytuacją!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nie udało się zmienić nazwy %s na %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1662,8 +1665,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1701,24 +1704,6 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - łatka " -"wygląda na uszkodzoną." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z " -"mmap - łatka wygląda na uszkodzoną" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" @@ -2781,88 +2766,88 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3087,7 +3072,7 @@ msgstr "Błędny rozmiar" msgid "Invalid file format" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3096,16 +3081,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3114,12 +3099,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3129,12 +3114,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3143,12 +3128,12 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3579,6 +3564,20 @@ msgstr "" msgid "Not locked" msgstr "Niezablokowany" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - " +#~ "łatka wygląda na uszkodzoną." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z " +#~ "mmap - łatka wygląda na uszkodzoną" + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Uwaga, wybieranie %s dla zadania \"%s\"\n" diff --git a/po/pt.po b/po/pt.po index dc53f4fcc..b114db28d 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -100,7 +100,7 @@ msgstr "O ficheiro do pacote %s está dessincronizado." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" @@ -725,13 +725,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -768,11 +771,11 @@ msgid "File not found" msgstr "Ficheiro não encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -847,9 +850,9 @@ msgstr "Uma resposta sobrecarregou o buffer." msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erro de escrita" @@ -1109,7 +1112,7 @@ msgstr "A ligação falhou" msgid "Internal error" msgstr "Erro interno" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1357,101 +1360,101 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1459,27 +1462,27 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1488,7 +1491,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[S/n]" @@ -1496,21 +1499,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1568,7 +1571,7 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1584,12 +1587,12 @@ msgstr "" "\tTenha em mente que o acesso exclusivo está desabilitado,\n" "\tpor isso não confie na relevância da real situação actual!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Falha ao baixar %s %s\n" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1635,8 +1638,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1674,24 +1677,6 @@ msgstr "Não pode ler ficheiro de mirror '%s'" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Não foi possível aplicar o patch %s com mmap e com a utilização de operação " -"de ficheiro - o patch parece estar corrompido." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Não foi possível aplicar o patch %s com mmap (mas não é uma falha especifica " -"do mmap) - o patch parece corrompido." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" @@ -2758,89 +2743,89 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3075,7 +3060,7 @@ msgstr "Tamanho incorrecto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3084,18 +3069,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3104,12 +3089,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3120,12 +3105,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3135,12 +3120,12 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3570,6 +3555,20 @@ msgstr "" msgid "Not locked" msgstr "Sem acesso exclusivo" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Não foi possível aplicar o patch %s com mmap e com a utilização de " +#~ "operação de ficheiro - o patch parece estar corrompido." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Não foi possível aplicar o patch %s com mmap (mas não é uma falha " +#~ "especifica do mmap) - o patch parece corrompido." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Note, a seleccionar '%s' para a tarefa '%s'\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2976484a7..9e5a5c2d0 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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." @@ -100,7 +100,7 @@ msgstr "O arquivo de pacote %s está fora de sincronia." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Nenhum pacote encontrado" @@ -697,13 +697,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -740,11 +743,11 @@ msgid "File not found" msgstr "Arquivo não encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" @@ -819,9 +822,9 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erro de escrita" @@ -1082,7 +1085,7 @@ msgstr "Conexão falhou" msgid "Internal error" msgstr "Erro interno" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1333,101 +1336,101 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "mas não será instalado" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1436,27 +1439,27 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1465,7 +1468,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[S/n]" @@ -1473,21 +1476,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1545,7 +1548,7 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1557,12 +1560,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Falha ao baixar %s %s\n" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1608,8 +1611,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1647,20 +1650,6 @@ msgstr "Não foi possível abrir arquivo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falhou ao criar pipe IPC para sub-processo" @@ -2722,91 +2711,91 @@ msgstr "Impossível analisar arquivo de pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3034,35 +3023,35 @@ msgstr "Tamanho incorreto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3070,12 +3059,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3085,12 +3074,12 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ro.po b/po/ro.po index 0816f9b56..90d46423a 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "Fișierul pachetului %s este desincronizat." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Nu s-au găsit pachete" @@ -696,13 +696,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -739,11 +742,11 @@ msgid "File not found" msgstr "Fișier negăsit" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -818,9 +821,9 @@ msgstr "Un răspuns a depășit zona de tampon." msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Eroare de scriere" @@ -1084,7 +1087,7 @@ msgstr "Conectare eșuată" msgid "Internal error" msgstr "Eroare internă" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1339,101 +1342,101 @@ msgstr "Instalați aceste pachete fără verificare?" msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Instalat]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalat]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Instalat]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "dar nu este instalat" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " sau" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1441,27 +1444,27 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" @@ -1470,7 +1473,7 @@ msgstr "%lu instalate sau șterse incomplet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1478,21 +1481,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -1550,7 +1553,7 @@ msgstr "Terminat" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1562,12 +1565,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Eșec la redenumirea lui %s în %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1613,8 +1616,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1652,20 +1655,6 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" @@ -2731,86 +2720,86 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3038,37 +3027,37 @@ msgstr "Nepotrivire dimensiune" msgid "Invalid file format" msgstr "Operațiune invalidă %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3076,12 +3065,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3090,12 +3079,12 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/ru.po b/po/ru.po index f01dba2f2..02a5424e7 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -108,7 +108,7 @@ msgstr "Список пакетов %s рассинхронизирован." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Не найдено ни одного пакета" @@ -730,13 +730,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -773,11 +776,11 @@ msgid "File not found" msgstr "Файл не найден" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -854,9 +857,9 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Ошибка записи" @@ -1116,7 +1119,7 @@ msgstr "Соединение разорвано" msgid "Internal error" msgstr "Внутренняя ошибка" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1375,102 +1378,102 @@ msgstr "Установить эти пакеты без проверки?" msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Установлен]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Установлен]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Установлен]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "но он не установлен" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " или" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1478,27 +1481,27 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" @@ -1507,7 +1510,7 @@ msgstr "не установлено до конца или удалено %lu п #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[Д/н]" @@ -1515,21 +1518,21 @@ msgstr "[Д/н]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "д" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "н" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" @@ -1589,7 +1592,7 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1605,12 +1608,12 @@ msgstr "" " Учтите, что блокировка не используется,\n" " поэтому нет полного соответствия с текущей реальной ситуацией!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Не удалось переименовать %s в %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1656,8 +1659,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1695,24 +1698,6 @@ msgstr "Невозможно прочитать файл на зеркале «% msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Не удалось наложить заплату %s с использованием mmap и файловой операции — " -"вероятно, повреждена заплата." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) — " -"вероятно, повреждена заплата." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" @@ -2782,90 +2767,90 @@ msgstr "Невозможно разобрать содержимое пакет msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет " "значения)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3094,7 +3079,7 @@ msgstr "Не совпадает размер" msgid "Invalid file format" msgstr "Неверная операция %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3103,16 +3088,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3121,12 +3106,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3136,12 +3121,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3150,12 +3135,12 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3583,6 +3568,20 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Не удалось наложить заплату %s с использованием mmap и файловой операции " +#~ "— вероятно, повреждена заплата." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) — " +#~ "вероятно, повреждена заплата." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Заметьте, выбирается «%s» для задачи «%s»\n" diff --git a/po/sk.po b/po/sk.po index 855a6c0fe..350d1e7a7 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "Súbor balíkov %s je neaktuálny." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" @@ -716,13 +716,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -759,11 +762,11 @@ msgid "File not found" msgstr "Súbor sa nenašiel" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -838,9 +841,9 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Chyba pri zápise" @@ -1096,7 +1099,7 @@ msgstr "Spojenie zlyhalo" msgid "Internal error" msgstr "Vnútorná chyba" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1352,101 +1355,101 @@ msgstr "Nainštalovať tieto nekontrolované balíky?" msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " alebo" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1454,27 +1457,27 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" @@ -1483,7 +1486,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1491,21 +1494,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -1563,7 +1566,7 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1579,12 +1582,12 @@ msgstr "" " Tiež pamätajte, že zamykanie je deaktivované, takže\n" " sa nespoliehajte na to že to bude platiť v reálnej situácii!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Premenovanie %s na %s zlyhalo" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1630,8 +1633,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1669,24 +1672,6 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - zdá " -"sa, že záplata je poškodená." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba týkajúca " -"sa mmap) - zdá sa, že záplata je poškodená." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" @@ -2737,87 +2722,87 @@ msgstr "Súbor %s sa nedá spracovať (1)" msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3039,7 +3024,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Invalid file format" msgstr "Neplatná operácia %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3048,16 +3033,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3066,12 +3051,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3081,12 +3066,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3095,12 +3080,12 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3517,6 +3502,20 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s msgid "Not locked" msgstr "Nie je zamknuté" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - " +#~ "zdá sa, že záplata je poškodená." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba " +#~ "týkajúca sa mmap) - zdá sa, že záplata je poškodená." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Poznámka: vyberá sa „%s“ pre úlohu „%s“\n" diff --git a/po/sl.po b/po/sl.po index b79fae756..41f2d8266 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "Datoteka paketa %s ni usklajena." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Noben paket ni bil najden" @@ -711,13 +711,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -754,11 +757,11 @@ msgid "File not found" msgstr "Datoteke ni mogoče najti" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -833,9 +836,9 @@ msgstr "Odgovor je prekoračil predpomnilnik." msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Napaka pisanja" @@ -1091,7 +1094,7 @@ msgstr "Povezava ni uspela" msgid "Internal error" msgstr "Notranja napaka" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1351,101 +1354,101 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?" msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ali" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1453,27 +1456,27 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" @@ -1482,7 +1485,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1490,21 +1493,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" @@ -1562,7 +1565,7 @@ msgstr "Opravljeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1578,12 +1581,12 @@ msgstr "" " Zaklepanje je onemogočeno, zato se ne zanašajte\n" " na pomembnost trenutnega pravega stanja!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Ni mogoče preimenovati %s v %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1629,8 +1632,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1668,24 +1671,6 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je " -"videti pokvarjen" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - popravek " -"je videti pokvarjen." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" @@ -2738,92 +2723,92 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče " "razčleniti)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima " "vrednosti)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Odpiranje %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3043,7 +3028,7 @@ msgstr "Neujemanje velikosti" msgid "Invalid file format" msgstr "Neveljavno opravilo %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3052,16 +3037,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3070,12 +3055,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3085,12 +3070,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3099,12 +3084,12 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3524,6 +3509,20 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. " msgid "Not locked" msgstr "Ni zaklenjeno" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je " +#~ "videti pokvarjen" + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - " +#~ "popravek je videti pokvarjen." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Izbiranje '%s' za nalogo '%s'\n" diff --git a/po/sv.po b/po/sv.po index 52868b94d..07fbf7078 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "Paketfilen %s är inte synkroniserad." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Inga paket hittades" @@ -696,13 +696,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -739,11 +742,11 @@ msgid "File not found" msgstr "Filen hittades inte" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -818,9 +821,9 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivfel" @@ -1084,7 +1087,7 @@ msgstr "Anslutningen misslyckades" msgid "Internal error" msgstr "Internt fel" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1336,101 +1339,101 @@ msgstr "Installera dessa paket utan verifiering?" msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Installerat]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Installerat]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Installerat]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "men det är inte installerat" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1438,27 +1441,27 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" @@ -1467,7 +1470,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[J/n]" @@ -1475,21 +1478,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -1547,7 +1550,7 @@ msgstr "Färdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1563,12 +1566,12 @@ msgstr "" " Tänk också på att låsningen är inaktiverad, så\n" " förlita dig inte på relevansen till den verkliga situationen!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Misslyckades med att byta namn på %s till %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1619,8 +1622,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1659,24 +1662,6 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "[Mirror: %s]" msgstr "[Spegel: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen " -"verkar vara skadad." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen verkar " -"vara skadad." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" @@ -2739,86 +2724,86 @@ msgstr "Kunde inte tolka paketfilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Rad %lu i källistan %s har fel format ([option] för kort)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3043,35 +3028,35 @@ msgstr "Storleken stämmer inte" msgid "Invalid file format" msgstr "Felaktig åtgärd %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3082,12 +3067,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3096,12 +3081,12 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3524,6 +3509,20 @@ msgstr "" msgid "Not locked" msgstr "Inte låst" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen " +#~ "verkar vara skadad." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen " +#~ "verkar vara skadad." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Observera, väljer \"%s\" för funktionen \"%s\"\n" diff --git a/po/th.po b/po/th.po index efaedaa6e..d15bb3ce8 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -100,7 +100,7 @@ msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับค #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "ไม่พบแพกเกจ" @@ -698,13 +698,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -740,11 +743,11 @@ msgid "File not found" msgstr "ไม่พบแฟ้ม" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -817,9 +820,9 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" @@ -1073,7 +1076,7 @@ msgstr "เชื่อมต่อไม่สำเร็จ" msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1308,101 +1311,101 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " หรือ" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1410,27 +1413,27 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" @@ -1439,7 +1442,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1447,21 +1450,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -1519,7 +1522,7 @@ msgstr "เสร็จแล้ว" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1535,12 +1538,12 @@ msgstr "" " อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n" " ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1586,8 +1589,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1625,21 +1628,6 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "ไม่สามารถปรับแก้ %s ด้วย mmap และการกระทำแฟ้ม - ดูเหมือนแพตช์จะเสีย" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"ไม่สามารถปรับแก้ %s ด้วย mmap (แต่ไม่พบข้อผิดพลาดที่เจาะจงเฉพาะ mmap) - ดูเหมือนแพตช์จะเสีย" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" @@ -2678,86 +2666,86 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1 msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "กำลังเปิด %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2976,7 +2964,7 @@ msgstr "ขนาดไม่ตรงกัน" msgid "Invalid file format" msgstr "ไม่รู้จักคำสั่ง %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2985,16 +2973,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3003,12 +2991,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3018,24 +3006,24 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3435,6 +3423,18 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี msgid "Not locked" msgstr "ไม่ได้ล็อคอยู่" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "ไม่สามารถปรับแก้ %s ด้วย mmap และการกระทำแฟ้ม - ดูเหมือนแพตช์จะเสีย" + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "ไม่สามารถปรับแก้ %s ด้วย mmap (แต่ไม่พบข้อผิดพลาดที่เจาะจงเฉพาะ mmap) - " +#~ "ดูเหมือนแพตช์จะเสีย" + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "หมายเหตุ: จะเลือก '%s' สำหรับงานติดตั้ง '%s'\n" diff --git a/po/tl.po b/po/tl.po index 2c3b26bef..84ddfdc76 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -105,7 +105,7 @@ msgstr "Wala sa sync ang talaksan ng paketeng %s." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Walang nahanap na mga pakete" @@ -693,13 +693,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -736,11 +739,11 @@ msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -815,9 +818,9 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error sa pagsulat" @@ -1077,7 +1080,7 @@ msgstr "Bigo ang koneksyon" msgid "Internal error" msgstr "Internal na error" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1323,101 +1326,101 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " o" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1425,27 +1428,27 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" @@ -1454,7 +1457,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[O/h]" @@ -1462,21 +1465,21 @@ msgstr "[O/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[o/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "H" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -1534,7 +1537,7 @@ msgstr "Tapos" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1546,12 +1549,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1597,8 +1600,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1636,20 +1639,6 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" @@ -2715,86 +2704,86 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3022,35 +3011,35 @@ msgstr "Di tugmang laki" msgid "Invalid file format" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3058,12 +3047,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3072,12 +3061,12 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." diff --git a/po/tr.po b/po/tr.po index 37ca4cd78..bc4947160 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -102,7 +102,7 @@ msgstr "%s paket dosyası eşzamansız." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Hiç paket bulunamadı" @@ -718,13 +718,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -761,11 +764,11 @@ msgid "File not found" msgstr "Dosya bulunamadı" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -840,9 +843,9 @@ msgstr "Bir yanıt arabelleği taşırdı." msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Yazma hatası" @@ -1096,7 +1099,7 @@ msgstr "Bağlantı başarısız" msgid "Internal error" msgstr "İç hata" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1348,101 +1351,101 @@ msgstr "Paketler doğrulanmadan kurulsun mu?" msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "ama kurulu değil" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " ya da" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1450,27 +1453,27 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" @@ -1479,7 +1482,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[E/h]" @@ -1487,21 +1490,21 @@ msgstr "[E/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[e/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "H" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" @@ -1561,7 +1564,7 @@ msgstr "Bitti" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1577,12 +1580,12 @@ msgstr "" " Unutmayın ki simülasyonda kilitleme yapılmaz,\n" " bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin." -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s, %s olarak yeniden adlandırılamadı" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1628,8 +1631,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1667,23 +1670,6 @@ msgstr "Yansı dosyası %s okunamıyor" msgid "[Mirror: %s]" msgstr "[Yansı: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi duruyor." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"%s mmap ile yamalanamadı (mmap'e özel bir hata değil) - yama bozuk gibi " -"duruyor." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Altsürece IPC borusu oluşturulamadı" @@ -2747,98 +2733,98 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)" msgid "Unable to parse package file %s (2)" msgstr "Paket dosyası %s ayrıştırılamadı (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] " "ayrıştırılamıyor)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama " "değil)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin " "anahtarı yok)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s " "anahtarına değer atanmamış)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "%s Açılıyor" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "" -"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3064,7 +3050,7 @@ msgstr "Boyutlar eşleşmiyor" msgid "Invalid file format" msgstr "Geçersiz işlem: %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3073,17 +3059,17 @@ msgstr "" "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " "dosyasındaki girdi ya da satır hatalı)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3092,12 +3078,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3107,12 +3093,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3121,12 +3107,12 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3541,6 +3527,20 @@ msgstr "" msgid "Not locked" msgstr "Kilitlenmemiş" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi " +#~ "duruyor." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "%s mmap ile yamalanamadı (mmap'e özel bir hata değil) - yama bozuk gibi " +#~ "duruyor." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Bilgi, '%2$s' görevi için '%1$s' seçiliyor\n" diff --git a/po/uk.po b/po/uk.po index 8fe66aa2f..c90ad239b 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -109,7 +109,7 @@ msgstr "Перелік пакунків %s розсинхронізований. #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Не знайдено жодного пакунка" @@ -728,13 +728,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -772,12 +775,12 @@ msgid "File not found" msgstr "Файл не знайдено" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -852,9 +855,9 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Помилка запису" @@ -1112,7 +1115,7 @@ msgstr "З'єднання не вдалося" msgid "Internal error" msgstr "Внутрішня помилка" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1369,101 +1372,101 @@ msgstr "Встановити ці пакунки без перевірки?" msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "але він не встановлений" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " чи" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1471,27 +1474,27 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" @@ -1500,7 +1503,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1508,21 +1511,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -1581,7 +1584,7 @@ msgstr "Виконано" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1597,12 +1600,12 @@ msgstr "" " Також не забувайте, що блокування вимикається,\n" " тому не очікуйте на відповідність поточній реальній ситуації!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Не вдалося перейменувати %s на %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1648,8 +1651,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1687,24 +1690,6 @@ msgstr "Неможливо прочитати файл дзеркала '%s'" msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає " -"пошкодженим." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Неможливо пропатчити %s з mmap (але не видно конкретної вини mmap) - патч " -"виглядає пошкодженим." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC канал для підпроцесу" @@ -2782,88 +2767,88 @@ msgstr "Неможливо проаналізувати файл пакунку msgid "Unable to parse package file %s (2)" msgstr "Неможливо проаналізувати файл пакунку %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Рядок %u є занадто довгим у переліку джерел %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворений рядок %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3087,7 +3072,7 @@ msgstr "Невідповідність розміру" msgid "Invalid file format" msgstr "Невірна дія %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3096,16 +3081,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3114,12 +3099,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3129,12 +3114,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3143,12 +3128,12 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3578,6 +3563,20 @@ msgstr "" msgid "Not locked" msgstr "Не заблоковано" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає " +#~ "пошкодженим." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Неможливо пропатчити %s з mmap (але не видно конкретної вини mmap) - патч " +#~ "виглядає пошкодженим." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Помітьте, вибирається '%s' для завдання '%s'\n" diff --git a/po/vi.po b/po/vi.po index d3e04716a..5f3ab193e 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+0100\n" "PO-Revision-Date: 2014-01-01 13:45+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -104,7 +104,7 @@ msgstr "Tập tin gói %s không đồng bộ được." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "Không tìm thấy gói" @@ -733,17 +733,21 @@ msgstr "" " apt-mark(8) và apt.conf(5)" #: cmdline/apt.cc:71 +#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -793,11 +797,11 @@ msgid "File not found" msgstr "Không tìm thấy tập tin" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -872,9 +876,9 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Lỗi ghi" @@ -1136,7 +1140,7 @@ msgstr "Kết nối bị lỗi" msgid "Internal error" msgstr "Gặp lỗi nội bộ" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "Đang liệt kê" @@ -1378,98 +1382,98 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?" msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy về %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "đã cài, có thể nâng cấp thành: " -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 msgid "[installed,local]" msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "[đã cài, có thể tự động gỡ bỏ]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 msgid "[installed,automatic]" msgstr "[đã cài đặt,tự động]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 msgid "[installed]" msgstr "[đã cài đặt]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "[có thể nâng cấp từ: " -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "[residual-config]" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "nhưng mà nó không được cài đặt" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " hay" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "Những gói MỚI sau sẽ được cài đặt:" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "Những gói sau sẽ bị GỠ BỎ:" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "Những gói sau đây được giữ lại:" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "Những gói sau đây sẽ được NÂNG CẤP:" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "Những gói sau đây sẽ bị HẠ CẤP:" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "Những gói sau đây sẽ được thay đổi:" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1477,27 +1481,27 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nâng cấp, %lu được cài đặt mới, " -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "%lu bị hạ cấp, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" @@ -1506,7 +1510,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "[C/k]" @@ -1514,21 +1518,21 @@ msgstr "[C/k]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "[c/K]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "C" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "K" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" @@ -1585,7 +1589,7 @@ msgstr "Xong" msgid "Full Text Search" msgstr "Tìm kiếm toàn văn" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "không là gói thật (ảo)" @@ -1601,12 +1605,12 @@ msgstr "" " Cần nhớ rằng chức năng khóa đã bị tắt,\n" " nên có thể nó không chính xác như những gì làm thật!" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, c-format msgid "Failed to parse %s. Edit again? " msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? " -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format 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”." @@ -1652,8 +1656,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1691,23 +1695,6 @@ msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”" msgid "[Mirror: %s]" msgstr "[Bản sao: %s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" -"Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị hỏng." - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" -"Không thể vá %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là " -"miếng vá bị hỏng." - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" @@ -2784,95 +2771,95 @@ msgstr "Không thể phân tích tập tin gói %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " "tích được)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " "gán)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " "trị)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "Đang mở %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -3096,7 +3083,7 @@ msgstr "Kích cỡ không khớp nhau" msgid "Invalid file format" msgstr "Định dạng tập tập tin không hợp lệ" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3105,16 +3092,16 @@ msgstr "" "Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " "sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3123,12 +3110,12 @@ msgstr "" "Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " "này sẽ không được áp dụng." -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3139,12 +3126,12 @@ msgstr "" "Lỗi GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3153,12 +3140,12 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3581,6 +3568,20 @@ msgstr "" msgid "Not locked" msgstr "Chưa được khoá" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị " +#~ "hỏng." + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "" +#~ "Không thể vá %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là " +#~ "miếng vá bị hỏng." + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Ghi chú: đang chọn “%s” cho tác vụ “%s”\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1267e2211..7d3269753 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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" @@ -101,7 +101,7 @@ msgstr "软件包文件 %s 尚未同步。" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "没有发现匹配的软件包" @@ -685,13 +685,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -728,11 +731,11 @@ msgid "File not found" msgstr "无法找到该文件" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -806,9 +809,9 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "写出错" @@ -1062,7 +1065,7 @@ msgstr "连接失败" msgid "Internal error" msgstr "内部错误" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1294,101 +1297,101 @@ msgstr "不经验证就安装这些软件包吗？" msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1396,27 +1399,27 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1425,7 +1428,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1433,21 +1436,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -1505,7 +1508,7 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1520,12 +1523,12 @@ msgstr "" "　　　apt-get 需要 root 特权进行实际的执行。\n" "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "无法将 %s 重命名为 %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1571,8 +1574,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1610,20 +1613,6 @@ msgstr "没有找到镜像文件 %s" msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" @@ -2667,86 +2656,86 @@ msgstr "无法解析软件包文件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" + +#: apt-pkg/sourcelist.cc:144 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2966,35 +2955,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "无效的操作 %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3003,12 +2992,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3017,12 +3006,12 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3423,6 +3412,16 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。" msgid "Not locked" msgstr "未锁定" +#~ msgid "" +#~ "Could not patch %s with mmap and with file operation usage - the patch " +#~ "seems to be corrupt." +#~ msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。" + +#~ msgid "" +#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " +#~ "seems to be corrupt." +#~ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。" + #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "注意，为任务 %2$s 选中了 %1$s\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 3c8e7f9d9..52f96ab81 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-01-05 10:10+0100\n" +"POT-Creation-Date: 2014-01-18 21:25+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." @@ -101,7 +101,7 @@ msgstr "套件檔 %s 未同步。" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 apt-private/private-show.cc:116 +#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 msgid "No packages found" msgstr "未找到套件" @@ -678,13 +678,16 @@ msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" +" remove - remove packages\n" +"\n" " upgrade - upgrade the systems packages\n" "\n" " edit-sources - edit the source information file\n" @@ -720,11 +723,11 @@ msgid "File not found" msgstr "找不到檔案" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:563 methods/rred.cc:576 methods/rred.cc:585 +#: methods/rred.cc:617 methods/rred.cc:626 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:582 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 msgid "Failed to set modification time" msgstr "無法設定修改時間" @@ -798,9 +801,9 @@ msgstr "回應超過緩衝區長度。" msgid "Protocol corruption" msgstr "協定失敗" -#: methods/ftp.cc:458 methods/rred.cc:240 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "寫入錯誤" @@ -1055,7 +1058,7 @@ msgstr "連線失敗" msgid "Internal error" msgstr "內部錯誤" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:147 msgid "Listing" msgstr "" @@ -1294,101 +1297,101 @@ msgstr "是否不經驗證就安裝這些套件？" msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:200 msgid "installed,upgradable to: " msgstr "" -#: apt-private/private-output.cc:204 +#: apt-private/private-output.cc:206 #, fuzzy msgid "[installed,local]" msgstr "【已安裝】" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:209 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,automatic]" msgstr "【已安裝】" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:213 #, fuzzy msgid "[installed]" msgstr "【已安裝】" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:219 msgid "[upgradable from: " msgstr "" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:225 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:314 +#: apt-private/private-output.cc:316 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有未滿足的相依關係：" -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:406 #, c-format msgid "but %s is installed" msgstr "但 %s 卻已安裝" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:408 #, c-format msgid "but %s is to be installed" msgstr "但 %s 卻將被安裝" -#: apt-private/private-output.cc:413 +#: apt-private/private-output.cc:415 msgid "but it is not installable" msgstr "但它卻無法安裝" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:417 msgid "but it is a virtual package" msgstr "但它是虛擬套件" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not installed" msgstr "但它卻尚未安裝" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:420 msgid "but it is not going to be installed" msgstr "但它卻將不會被安裝" -#: apt-private/private-output.cc:423 +#: apt-private/private-output.cc:425 msgid " or" msgstr "或" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:454 msgid "The following NEW packages will be installed:" msgstr "下列【新】套件將會被安裝：" -#: apt-private/private-output.cc:478 +#: apt-private/private-output.cc:480 msgid "The following packages will be REMOVED:" msgstr "下列套件將會被【移除】：" -#: apt-private/private-output.cc:500 +#: apt-private/private-output.cc:502 msgid "The following packages have been kept back:" msgstr "下列套件將會維持其原有版本：" -#: apt-private/private-output.cc:521 +#: apt-private/private-output.cc:523 msgid "The following packages will be upgraded:" msgstr "下列套件將會被升級：" -#: apt-private/private-output.cc:542 +#: apt-private/private-output.cc:544 msgid "The following packages will be DOWNGRADED:" msgstr "下列套件將會被【降級】：" -#: apt-private/private-output.cc:562 +#: apt-private/private-output.cc:564 msgid "The following held packages will be changed:" msgstr "下列被保留 (hold) 的套件將會被更改：" -#: apt-private/private-output.cc:617 +#: apt-private/private-output.cc:619 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: apt-private/private-output.cc:625 +#: apt-private/private-output.cc:627 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1396,27 +1399,27 @@ msgstr "" "【警告】：下列的基本套件都將被移除。\n" "除非您很清楚您在做什麼，否則請勿輕易嘗試！" -#: apt-private/private-output.cc:656 +#: apt-private/private-output.cc:658 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升級 %lu 個，新安裝 %lu 個，" -#: apt-private/private-output.cc:660 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個，" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:664 #, c-format msgid "%lu downgraded, " msgstr "降級 %lu 個，" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "移除 %lu 個，有 %lu 個未被升級。\n" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個沒有完整得安裝或移除。\n" @@ -1425,7 +1428,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:690 +#: apt-private/private-output.cc:692 msgid "[Y/n]" msgstr "" @@ -1433,21 +1436,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:698 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:707 +#: apt-private/private-output.cc:709 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:715 msgid "N" msgstr "" -#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -1505,7 +1508,7 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:106 +#: apt-private/private-show.cc:105 msgid "not a real package (virtual)" msgstr "" @@ -1517,12 +1520,12 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:41 +#: apt-private/private-sources.cc:45 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "無法將 %s 更名為 %s" -#: apt-private/private-sources.cc:52 +#: apt-private/private-sources.cc:57 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" @@ -1568,8 +1571,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:207 -#: apt-pkg/sourcelist.cc:213 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 +#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -1607,20 +1610,6 @@ msgstr "無法開啟檔案 %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:499 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:504 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "無法和子程序建立 IPC 管線" @@ -2666,86 +2655,86 @@ msgstr "無法辨識套件檔 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" -#: apt-pkg/sourcelist.cc:97 +#: apt-pkg/sourcelist.cc:84 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" + +#: apt-pkg/sourcelist.cc:144 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:100 +#: apt-pkg/sourcelist.cc:147 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:111 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:117 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:120 +#: apt-pkg/sourcelist.cc:167 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:133 +#: apt-pkg/sourcelist.cc:180 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" -#: apt-pkg/sourcelist.cc:135 +#: apt-pkg/sourcelist.cc:182 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:138 +#: apt-pkg/sourcelist.cc:185 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" -#: apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:198 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:262 +#: apt-pkg/sourcelist.cc:309 #, c-format msgid "Opening %s" msgstr "正在開啟 %s" -#: apt-pkg/sourcelist.cc:274 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "來源列表 %2$s 中的第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:298 +#: apt-pkg/sourcelist.cc:345 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" -#: apt-pkg/sourcelist.cc:302 +#: apt-pkg/sourcelist.cc:349 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/sourcelist.cc:340 +#: apt-pkg/sourcelist.cc:386 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/sourcelist.cc:348 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" - #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format msgid "" @@ -2960,35 +2949,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "無效的操作 %s" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1561 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1582 +#: apt-pkg/acquire-item.cc:1577 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1624 +#: apt-pkg/acquire-item.cc:1619 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1662 +#: apt-pkg/acquire-item.cc:1657 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1684 +#: apt-pkg/acquire-item.cc:1679 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1714 +#: apt-pkg/acquire-item.cc:1709 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2996,12 +2985,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1724 apt-pkg/acquire-item.cc:1729 +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1852 +#: apt-pkg/acquire-item.cc:1847 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3010,12 +2999,12 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1918 +#: apt-pkg/acquire-item.cc:1913 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1976 +#: apt-pkg/acquire-item.cc:1971 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -- cgit v1.2.3 From 1700c3cfb902f3f61fa4d9269523467fcceaaf58 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 18 Jan 2014 23:42:51 +0100 Subject: do not ignore ioctl(TIOCSCTTY) errors Show a proper error message when a ioctl() in dpkgpm.cc fails. Also simply StartPtyMagic() a bit. --- apt-pkg/deb/dpkgpm.cc | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 14ce133cf..506ebf620 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1028,6 +1028,12 @@ bool pkgDPkgPM::Go(int StatusFd) void pkgDPkgPM::StartPtyMagic() { + if (_config->FindB("Dpkg::Use-Pty", true) == false) + { + d->master = d->slave = -1; + return; + } + // setup the pty and stuff struct winsize win; @@ -1036,10 +1042,9 @@ void pkgDPkgPM::StartPtyMagic() _error->PushToStack(); if (tcgetattr(STDOUT_FILENO, &d->tt) == 0) { - ioctl(1, TIOCGWINSZ, (char *)&win); - if (_config->FindB("Dpkg::Use-Pty", true) == false) + if (ioctl(1, TIOCGWINSZ, (char *)&win) < 0) { - d->master = d->slave = -1; + _error->Errno("ioctl", _("ioctl(TIOCGWINSZ) failed")); } else if (openpty(&d->master, &d->slave, NULL, &d->tt, &win) < 0) { _error->Errno("openpty", _("Can not write log (%s)"), _("Is /dev/pts mounted?")); @@ -1393,12 +1398,17 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) if(d->slave >= 0 && d->master >= 0) { setsid(); - ioctl(d->slave, TIOCSCTTY, 0); - close(d->master); - dup2(d->slave, 0); - dup2(d->slave, 1); - dup2(d->slave, 2); - close(d->slave); + int res = ioctl(d->slave, TIOCSCTTY, 0); + if (res < 0) { + std::cerr << "ioctl(TIOCSCTTY) failed for fd: " + << d->slave << std::endl; + } else { + close(d->master); + dup2(d->slave, 0); + dup2(d->slave, 1); + dup2(d->slave, 2); + close(d->slave); + } } close(fd[0]); // close the read end of the pipe -- cgit v1.2.3 From e67b9a23d7646d2f1e21bf4039fa71cc66b628c5 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Mon, 20 Jan 2014 07:43:17 +0100 Subject: add Description tag for deb822 sources --- doc/sources.list.5.xml | 4 ++++ test/integration/test-apt-sources-deb822 | 6 +++--- test/libapt/sourcelist_test.cc | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 87f4d5fc5..b2b682292 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -87,6 +87,8 @@ URI: http://example.com Suites: stable Sections: component1 component2 + Description: short + long long long [option1]: [option1-value] Type: deb-src @@ -94,6 +96,8 @@ Suites: stable Sections: component1 component2 [option1]: [option1-value] + Description: short + long long long </literallayout> </para> diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index c73b942d4..34708d2d1 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -23,12 +23,11 @@ Type: deb URI: http://ftp.debian.org/debian Suites: stable Sections: main -Comment: Some random string - that can be very long" +Description: summay + and the long part" # simple case echo "$BASE" > $SOURCES - testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris @@ -75,3 +74,4 @@ Suites: stable testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse) E: The list of sources could not be read." aptget update --print-uris + diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index ae5d11f66..b9dd47207 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -26,8 +26,8 @@ int main(int argc, char *argv[]) "URI: http://ftp.debian.org/debian\n" "Suites: stable\n" "Sections: main\n" - "Comment: Some random string\n" - " that can be very long\n" + "Description: short\n" + " long description that can be very long\n" "\n" "Type: deb\n" "URI: http://ftp.debian.org/debian\n" -- cgit v1.2.3 From 7dd62ea93413a73b4ec394b16ff4e0367d226395 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Mon, 20 Jan 2014 07:59:11 +0100 Subject: add support for Enabled: no in deb822 sources.list --- apt-pkg/sourcelist.cc | 4 ++++ doc/sources.list.5.xml | 5 +++-- test/integration/test-apt-sources-deb822 | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 4e580ba04..5d41fb00e 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -84,6 +84,10 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List, _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); return false; } + + string Enabled = Tags.FindS("Enabled"); + if (Enabled.size() > 0 && StringToBool(Enabled) == false) + return true; // Define external/internal options const char* option_deb822[] = { diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index b2b682292..a2f6e985e 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -85,7 +85,7 @@ <literallayout> Type: deb URI: http://example.com - Suites: stable + Suites: stable testing Sections: component1 component2 Description: short long long long @@ -95,9 +95,10 @@ URI: http://example.com Suites: stable Sections: component1 component2 - [option1]: [option1-value] + Enabled: no Description: short long long long + [option1]: [option1-value] </literallayout> </para> diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 34708d2d1..f461314e6 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -75,3 +75,7 @@ Suites: stable testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse) E: The list of sources could not be read." aptget update --print-uris +# with Enabled: false +echo "$BASE" > $SOURCES +echo "Enabled: no" >> $SOURCES +testempty aptget update --print-uris -- cgit v1.2.3 From 75c10df1533ede97e05fef3d1e2fc6a22fc4db00 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Mon, 20 Jan 2014 08:10:50 +0100 Subject: add support for multiple URIs in deb822 style sources.list --- apt-pkg/sourcelist.cc | 29 ++++++++++++++++++----------- doc/sources.list.5.xml | 4 ++-- test/integration/test-apt-sources-deb822 | 11 ++++++++++- test/libapt/sourcelist_test.cc | 4 ++-- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 5d41fb00e..339005149 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -78,13 +78,6 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List, { map<string, string> Options; - string URI = Tags.FindS("URI"); - if (!FixupURI(URI)) - { - _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); - return false; - } - string Enabled = Tags.FindS("Enabled"); if (Enabled.size() > 0 && StringToBool(Enabled) == false) return true; @@ -104,20 +97,34 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List, string Suite = Tags.FindS("Suites"); Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture")); string const Section = Tags.FindS("Sections"); + string URIS = Tags.FindS("URIs"); + std::vector<std::string> list_uris = StringSplit(URIS, " "); std::vector<std::string> list_dist = StringSplit(Suite, " "); std::vector<std::string> list_section = StringSplit(Section, " "); - for (std::vector<std::string>::const_iterator I = list_dist.begin(); - I != list_dist.end(); I++) + + for (std::vector<std::string>::const_iterator U = list_uris.begin(); + U != list_uris.end(); U++) { - for (std::vector<std::string>::const_iterator J = list_section.begin(); - J != list_section.end(); J++) + std::string URI = (*U); + if (!FixupURI(URI)) + { + _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); + return false; + } + + for (std::vector<std::string>::const_iterator I = list_dist.begin(); + I != list_dist.end(); I++) + { + for (std::vector<std::string>::const_iterator J = list_section.begin(); + J != list_section.end(); J++) { if (CreateItem(List, URI, (*I), (*J), Options) == false) { return false; } } + } } return true; } diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index a2f6e985e..5a421293e 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -84,7 +84,7 @@ <para>Alternatively a rfc822 style format is also supported: <literallayout> Type: deb - URI: http://example.com + URIs: http://example.com Suites: stable testing Sections: component1 component2 Description: short @@ -92,7 +92,7 @@ [option1]: [option1-value] Type: deb-src - URI: http://example.com + URIs: http://example.com Suites: stable Sections: component1 component2 Enabled: no diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index f461314e6..5c91dd6f5 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -20,7 +20,7 @@ BASE="# some comment #Type: meep Type: deb -URI: http://ftp.debian.org/debian +URIs: http://ftp.debian.org/debian Suites: stable Sections: main Description: summay @@ -79,3 +79,12 @@ E: The list of sources could not be read." aptget update --print-uris echo "$BASE" > $SOURCES echo "Enabled: no" >> $SOURCES testempty aptget update --print-uris + +# multiple URIs +echo "$BASE" | sed -e 's#http://ftp.debian.org/debian#http://ftp.debian.org/debian http://ftp.de.debian.org/debian#' > $SOURCES +testequalwithmsg "Multiple URIs work" "'http://ftp.de.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.de.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.de.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.de.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.de.debian.org/debian/dists/stable/InRelease' ftp.de.debian.org_debian_dists_stable_InRelease 0 +'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index b9dd47207..3597b3d58 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -23,14 +23,14 @@ int main(int argc, char *argv[]) { const char contents[] = "" "Type: deb\n" - "URI: http://ftp.debian.org/debian\n" + "URIs: http://ftp.debian.org/debian\n" "Suites: stable\n" "Sections: main\n" "Description: short\n" " long description that can be very long\n" "\n" "Type: deb\n" - "URI: http://ftp.debian.org/debian\n" + "URIs: http://ftp.debian.org/debian\n" "Suite: unstable\n" "Section: main non-free\n" ; -- cgit v1.2.3 From 7f316a3feab95370f1dd28c08c58bc3c140bf0a0 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Mon, 20 Jan 2014 08:17:43 +0100 Subject: add support for multipl types in one line --- apt-pkg/sourcelist.cc | 25 +++++++++++++++---------- doc/sources.list.5.xml | 8 ++++---- test/integration/test-apt-sources-deb822 | 13 ++++++++++--- test/libapt/sourcelist_test.cc | 8 ++++---- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 339005149..bbc514f5b 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -387,21 +387,26 @@ int pkgSourceList::ParseFileDeb822(string File) // read step by step while (Sources.Step(Tags) == true) { - if(!Tags.Exists("Type")) + if(!Tags.Exists("Types")) continue; - string const type = Tags.FindS("Type"); - Type *Parse = Type::GetType(type.c_str()); - if (Parse == 0) + string const types = Tags.FindS("Types"); + std::vector<std::string> list_types = StringSplit(types, " "); + for (std::vector<std::string>::const_iterator I = list_types.begin(); + I != list_types.end(); I++) { - _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); - return -1; - } + Type *Parse = Type::GetType((*I).c_str()); + if (Parse == 0) + { + _error->Error(_("Type '%s' is not known on stanza %u in source list %s"), (*I).c_str(),i,Fd.Name().c_str()); + return -1; + } - if (!Parse->ParseStanza(SrcList, Tags, i, Fd)) - return -1; + if (!Parse->ParseStanza(SrcList, Tags, i, Fd)) + return -1; - i++; + i++; + } } // we are done, return the number of stanzas read diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 5a421293e..4d0c4d502 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -83,7 +83,7 @@ <para>Alternatively a rfc822 style format is also supported: <literallayout> - Type: deb + Types: deb deb-src URIs: http://example.com Suites: stable testing Sections: component1 component2 @@ -91,9 +91,9 @@ long long long [option1]: [option1-value] - Type: deb-src - URIs: http://example.com - Suites: stable + Types: deb + URIs: http://another.example.com + Suites: experimental Sections: component1 component2 Enabled: no Description: short diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 5c91dd6f5..e74fc4cb9 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -17,9 +17,9 @@ testequalwithmsg "Old style sources.list works" "'http://ftp.debian.org/debian/d BASE="# some comment # that contains a : as well -#Type: meep +#Types: meep -Type: deb +Types: deb URIs: http://ftp.debian.org/debian Suites: stable Sections: main @@ -68,7 +68,7 @@ echo "deb http://ftp.debian.org" > $SOURCES testequalwithmsg "Invalid sources.list file gives proper error" "E: Malformed line 1 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (dist) E: The list of sources could not be read." aptget update --print-uris -echo "Type: deb +echo "Types: deb Suites: stable " > $SOURCES @@ -88,3 +88,10 @@ testequalwithmsg "Multiple URIs work" "'http://ftp.de.debian.org/debian/dists/st 'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + +# multiple Type in one field +echo "$BASE" | sed -e 's#Types: deb#Types: deb deb-src#' > $SOURCES +testequalwithmsg "Multiple Types work" "'http://ftp.debian.org/debian/dists/stable/main/source/Sources.bz2' ftp.debian.org_debian_dists_stable_main_source_Sources 0 : +'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 3597b3d58..6ab30ba67 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -22,17 +22,17 @@ void remove_tmpfile(void) int main(int argc, char *argv[]) { const char contents[] = "" - "Type: deb\n" + "Types: deb\n" "URIs: http://ftp.debian.org/debian\n" "Suites: stable\n" "Sections: main\n" "Description: short\n" " long description that can be very long\n" "\n" - "Type: deb\n" + "Types: deb\n" "URIs: http://ftp.debian.org/debian\n" - "Suite: unstable\n" - "Section: main non-free\n" + "Suites: unstable\n" + "Sections: main non-free\n" ; FileFd fd; -- cgit v1.2.3 From 2fd754cfe9a92fe85f4dd56447c70112b64b003e Mon Sep 17 00:00:00 2001 From: Anthony Towns <aj@erisian.com.au> Date: Tue, 21 Jan 2014 05:00:12 +1000 Subject: methods/rred: minor robustness improvements Use retry_fwrite to better handle partial fwrite successes, and to keep the Hashes in sync with what's actually written. --- methods/rred.cc | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index 313166160..d17ab110d 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -351,14 +351,27 @@ class Patch { FileChanges filechanges; MemBlock add_text; + static bool retry_fwrite(char *b, size_t l, FILE *f, Hashes *hash) + { + size_t r = 1; + while (r > 0 && l > 0) + { + r = fwrite(b, 1, l, f); + if (hash) + hash->Add((unsigned char*)b, r); + l -= r; + b += r; + } + return l == 0; + } + static void dump_rest(FILE *o, FILE *i, Hashes *hash) { char buffer[BLOCK_SIZE]; size_t l; while (0 < (l = fread(buffer, 1, sizeof(buffer), i))) { - fwrite(buffer, 1, l, o); - if (hash) - hash->Add((unsigned char*)buffer, l); + if (!retry_fwrite(buffer, l, o, hash)) + break; } } @@ -372,10 +385,7 @@ class Patch { l = strlen(buffer); if (l == 0 || buffer[l-1] == '\n') n--; - fwrite(buffer, 1, l, o); - - if (hash) - hash->Add((unsigned char*)buffer, l); + retry_fwrite(buffer, l, o, hash); } } @@ -392,17 +402,8 @@ class Patch { } } - static bool dump_mem(FILE *o, char *p, size_t s, Hashes *hash) { - size_t r; - while (s > 0) { - r = fwrite(p, 1, s, o); - if (hash) - hash->Add((unsigned char*)p, s); - s -= r; - p += r; - if (r == 0) return false; - } - return true; + static void dump_mem(FILE *o, char *p, size_t s, Hashes *hash) { + retry_fwrite(p, s, o, hash); } public: @@ -455,7 +456,7 @@ class Patch { filechanges.add_change(ch); break; } - } else { /* !cmdwaanted */ + } else { /* !cmdwanted */ if (buffer[0] == '.' && buffer[1] == '\n') { cmdwanted = true; filechanges.add_change(ch); -- cgit v1.2.3 From 1bef0dd58a281ca2f2900a48459d2c87b4ba8bba Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 22 Jan 2014 08:25:02 +0100 Subject: add integration test for apt search --- apt-private/private-search.cc | 2 +- test/integration/test-apt-binary | 47 ------------------------------------ test/integration/test-apt-cli-list | 47 ++++++++++++++++++++++++++++++++++++ test/integration/test-apt-cli-search | 45 ++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 48 deletions(-) delete mode 100755 test/integration/test-apt-binary create mode 100755 test/integration/test-apt-cli-list create mode 100755 test/integration/test-apt-cli-search diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc index ff4140fa7..9d7f36138 100644 --- a/apt-private/private-search.cc +++ b/apt-private/private-search.cc @@ -53,7 +53,7 @@ bool FullTextSearch(CommandLine &CmdL) /*{{{*/ std::map<std::string, std::string>::const_iterator K; LocalitySortedVersionSet bag; - OpTextProgress progress; + OpTextProgress progress(*_config); progress.OverallProgress(0, 100, 50, _("Sorting")); GetLocalitySortedVersionSet(CacheFile, bag, progress); LocalitySortedVersionSet::iterator V = bag.begin(); diff --git a/test/integration/test-apt-binary b/test/integration/test-apt-binary deleted file mode 100755 index 8d5df9051..000000000 --- a/test/integration/test-apt-binary +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -set -e - -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework - -setupenvironment -configarchitecture "i386" - -insertpackage 'unstable' 'foo' 'all' '1.0' -insertinstalledpackage 'bar' 'i386' '1.0' - -insertinstalledpackage 'foobar' 'i386' '1.0' -insertpackage 'unstable' 'foobar' 'i386' '2.0' - -setupaptarchive - -APTARCHIVE=$(readlink -f ./aptarchive) - -testequal "Listing... -bar/now 1.0 [installed,local] i386 -foo/unstable 1.0 all -foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list - -testequal "Listing... -foo/unstable 1.0 all -foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list "foo*" - -testequal "Listing... -foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list --upgradable - -# FIXME: hm, hm - does it make sense to have this different? shouldn't -# we use "installed,upgradable" consitently? -testequal "Listing... -bar/now 1.0 [installed,local] i386 -foobar/now 1.0 [installed,upgradable to: 2.0] i386" apt list --installed - -testequal "Listing... -foobar/unstable 2.0 [upgradable from: 1.0] i386 -foobar/now 1.0 [installed,upgradable to: 2.0] i386 -" apt list foobar --all-versions - -testequal "Listing... -bar/now 1.0 [installed,local] i386 - an autogenerated dummy bar=1.0/installed -" apt list bar --verbose - diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list new file mode 100755 index 000000000..8d5df9051 --- /dev/null +++ b/test/integration/test-apt-cli-list @@ -0,0 +1,47 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +insertpackage 'unstable' 'foo' 'all' '1.0' +insertinstalledpackage 'bar' 'i386' '1.0' + +insertinstalledpackage 'foobar' 'i386' '1.0' +insertpackage 'unstable' 'foobar' 'i386' '2.0' + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +testequal "Listing... +bar/now 1.0 [installed,local] i386 +foo/unstable 1.0 all +foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list + +testequal "Listing... +foo/unstable 1.0 all +foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list "foo*" + +testequal "Listing... +foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list --upgradable + +# FIXME: hm, hm - does it make sense to have this different? shouldn't +# we use "installed,upgradable" consitently? +testequal "Listing... +bar/now 1.0 [installed,local] i386 +foobar/now 1.0 [installed,upgradable to: 2.0] i386" apt list --installed + +testequal "Listing... +foobar/unstable 2.0 [upgradable from: 1.0] i386 +foobar/now 1.0 [installed,upgradable to: 2.0] i386 +" apt list foobar --all-versions + +testequal "Listing... +bar/now 1.0 [installed,local] i386 + an autogenerated dummy bar=1.0/installed +" apt list bar --verbose + diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search new file mode 100755 index 000000000..aa6018bca --- /dev/null +++ b/test/integration/test-apt-cli-search @@ -0,0 +1,45 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +DESCR='Some description that has a unusual word xxyyzz and aabbcc' +DESCR2='Some other description with the unusual aabbcc only' +insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR" +insertpackage 'testing' 'bar' 'i386' '2.0' '' '' "$DESCR2" + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +# with OP progress +testequal "Sorting... +Full Text Search... +foo/unstable 1.0 all + $DESCR +" apt search xxyyzz + +# without op progress +testequal "foo/unstable 1.0 all + $DESCR +" apt search -qq xxyyzz + +# search with multiple words is a AND search +testequal "foo/unstable 1.0 all + $DESCR +" apt search -qq aabbcc xxyyzz + +# output is sorted and search word finds both package +testequal "bar/testing 2.0 i386 + $DESCR2 + +foo/unstable 1.0 all + $DESCR +" apt search -qq aabbcc + + + -- cgit v1.2.3 From 6d73fe5be080e66a4f6ff2b250ed1957ae7ac063 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 22 Jan 2014 16:41:00 +0100 Subject: add test for apt show --- cmdline/apt.cc | 3 ++- test/integration/test-apt-cli-search | 3 --- test/integration/test-apt-cli-show | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100755 test/integration/test-apt-cli-show diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 61d5d938a..07ade6b7c 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -103,10 +103,11 @@ int main(int argc, const char *argv[]) /*{{{*/ CommandLine::Dispatch Cmds[] = {{"list",&List}, {"search", &FullTextSearch}, {"show", &APT::Cmd::ShowPackage}, - // needs root + // package stuff {"install",&DoInstall}, {"remove", &DoInstall}, {"purge", &DoInstall}, + // system wide stuff {"update",&DoUpdate}, {"upgrade",&DoAptUpgrade}, // misc diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search index aa6018bca..979aff880 100755 --- a/test/integration/test-apt-cli-search +++ b/test/integration/test-apt-cli-search @@ -40,6 +40,3 @@ testequal "bar/testing 2.0 i386 foo/unstable 1.0 all $DESCR " apt search -qq aabbcc - - - diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show new file mode 100755 index 000000000..0ab3d2e56 --- /dev/null +++ b/test/integration/test-apt-cli-show @@ -0,0 +1,29 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +DESCR='Some description + That has multiple lines' +insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR" + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +# note that we do not display Description-md5 with the "apt" cmd +testequal "Package: foo +Priority: optional +Section: other +Installed-Size: 42 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Version: 1.0 +Filename: pool/main/foo/foo_1.0_all.deb +Description: Some description + That has multiple lines +" apt show foo -- cgit v1.2.3 From 9e51c0b6a3a1a36336820eda11bcfd5534d9d80c Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 22 Jan 2014 17:18:26 +0100 Subject: "apt show" show user friendly size info The size/installed-size is displayed via SizeToStr() and Size is rewriten to "Download-Size" to make clear what size is refered to here. --- apt-pkg/tagfile.cc | 84 +++++++++++++++++++------------------- apt-private/private-show.cc | 28 +++++++++---- test/integration/test-apt-cli-show | 3 +- 3 files changed, 65 insertions(+), 50 deletions(-) diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index bef3c76ba..b92b2c15a 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -567,52 +567,54 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[], } // Write all all of the tags, in order. - for (unsigned int I = 0; Order[I] != 0; I++) + if (Order != NULL) { - bool Rewritten = false; - - // See if this is a field that needs to be rewritten - for (unsigned int J = 0; Rewrite != 0 && Rewrite[J].Tag != 0; J++) + for (unsigned int I = 0; Order[I] != 0; I++) { - if (strcasecmp(Rewrite[J].Tag,Order[I]) == 0) - { - Visited[J] |= 2; - if (Rewrite[J].Rewrite != 0 && Rewrite[J].Rewrite[0] != 0) - { - if (isspace(Rewrite[J].Rewrite[0])) - fprintf(Output,"%s:%s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite); - else - fprintf(Output,"%s: %s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite); - } - - Rewritten = true; - break; - } - } + bool Rewritten = false; + + // See if this is a field that needs to be rewritten + for (unsigned int J = 0; Rewrite != 0 && Rewrite[J].Tag != 0; J++) + { + if (strcasecmp(Rewrite[J].Tag,Order[I]) == 0) + { + Visited[J] |= 2; + if (Rewrite[J].Rewrite != 0 && Rewrite[J].Rewrite[0] != 0) + { + if (isspace(Rewrite[J].Rewrite[0])) + fprintf(Output,"%s:%s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite); + else + fprintf(Output,"%s: %s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite); + } + Rewritten = true; + break; + } + } - // See if it is in the fragment - unsigned Pos; - if (Tags.Find(Order[I],Pos) == false) - continue; - Visited[Pos] |= 1; - - if (Rewritten == true) - continue; + // See if it is in the fragment + unsigned Pos; + if (Tags.Find(Order[I],Pos) == false) + continue; + Visited[Pos] |= 1; + + if (Rewritten == true) + continue; - /* Write out this element, taking a moment to rewrite the tag - in case of changes of case. */ - const char *Start; - const char *Stop; - Tags.Get(Start,Stop,Pos); + /* Write out this element, taking a moment to rewrite the tag + in case of changes of case. */ + const char *Start; + const char *Stop; + Tags.Get(Start,Stop,Pos); - if (fputs(Order[I],Output) < 0) - return _error->Errno("fputs","IO Error to output"); - Start += strlen(Order[I]); - if (fwrite(Start,Stop - Start,1,Output) != 1) - return _error->Errno("fwrite","IO Error to output"); - if (Stop[-1] != '\n') - fprintf(Output,"\n"); - } + if (fputs(Order[I],Output) < 0) + return _error->Errno("fputs","IO Error to output"); + Start += strlen(Order[I]); + if (fwrite(Start,Stop - Start,1,Output) != 1) + return _error->Errno("fwrite","IO Error to output"); + if (Stop[-1] != '\n') + fprintf(Output,"\n"); + } + } // Now write all the old tags that were missed. for (unsigned int I = 0; I != Tags.Count(); I++) diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 0aa42ecce..32a49cc5c 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -57,20 +57,32 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, return false; pkgTagSection Tags; pkgTagFile TagF(&PkgF); - + + if (TagF.Jump(Tags, V.FileList()->Offset) == false) + return _error->Error("Internal Error, Unable to parse a package record"); + + // make size nice + std::string installed_size; + if (Tags.FindI("Installed-Size") > 0) + installed_size = SizeToStr(Tags.FindI("Installed-Size")*1024); + else + installed_size = _("unknown"); + std::string package_size; + if (Tags.FindI("Size") > 0) + package_size = SizeToStr(Tags.FindI("Size")); + else + package_size = _("unknown"); + TFRewriteData RW[] = { {"Conffiles",0}, {"Description",0}, {"Description-md5",0}, + {"Installed-Size", installed_size.c_str(), 0}, + {"Size", package_size.c_str(), "Download-Size"}, {} }; - const char *Zero = 0; - if (TagF.Jump(Tags, V.FileList()->Offset) == false || - TFRewrite(stdout,Tags,&Zero,RW) == false) - { - _error->Error("Internal Error, Unable to parse a package record"); - return false; - } + if(TFRewrite(stdout, Tags, NULL, RW) == false) + return _error->Error("Internal Error, Unable to parse a package record"); // write the description pkgRecords Recs(*Cache); diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index 0ab3d2e56..bbb2de7ef 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -19,11 +19,12 @@ APTARCHIVE=$(readlink -f ./aptarchive) testequal "Package: foo Priority: optional Section: other -Installed-Size: 42 +Installed-Size: 43.0 k Maintainer: Joe Sixpack <joe@example.org> Architecture: all Version: 1.0 Filename: pool/main/foo/foo_1.0_all.deb +Download-Size: unknown Description: Some description That has multiple lines " apt show foo -- cgit v1.2.3 From b18dd45f2c71fbdf5c0eef113e9e8e01f84b70a7 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 22 Jan 2014 18:59:14 +0100 Subject: releasing package apt version 0.9.14.3~exp4 --- configure.ac | 2 +- debian/changelog | 12 +++++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 97 +++++++++++++++++++++++++++------------------------- doc/po/de.po | 97 +++++++++++++++++++++++++++------------------------- doc/po/es.po | 97 +++++++++++++++++++++++++++------------------------- doc/po/fr.po | 97 +++++++++++++++++++++++++++------------------------- doc/po/it.po | 97 +++++++++++++++++++++++++++------------------------- doc/po/ja.po | 97 +++++++++++++++++++++++++++------------------------- doc/po/pl.po | 97 +++++++++++++++++++++++++++------------------------- doc/po/pt.po | 97 +++++++++++++++++++++++++++------------------------- doc/po/pt_BR.po | 97 +++++++++++++++++++++++++++------------------------- po/ar.po | 66 ++++++++++++++++++----------------- po/ast.po | 66 ++++++++++++++++++----------------- po/bg.po | 66 ++++++++++++++++++----------------- po/bs.po | 66 ++++++++++++++++++----------------- po/ca.po | 66 ++++++++++++++++++----------------- po/cs.po | 66 ++++++++++++++++++----------------- po/cy.po | 66 ++++++++++++++++++----------------- po/da.po | 66 ++++++++++++++++++----------------- po/de.po | 66 ++++++++++++++++++----------------- po/dz.po | 66 ++++++++++++++++++----------------- po/el.po | 66 ++++++++++++++++++----------------- po/es.po | 66 ++++++++++++++++++----------------- po/eu.po | 66 ++++++++++++++++++----------------- po/fi.po | 66 ++++++++++++++++++----------------- po/fr.po | 66 ++++++++++++++++++----------------- po/gl.po | 66 ++++++++++++++++++----------------- po/hu.po | 66 ++++++++++++++++++----------------- po/it.po | 66 ++++++++++++++++++----------------- po/ja.po | 66 ++++++++++++++++++----------------- po/km.po | 66 ++++++++++++++++++----------------- po/ko.po | 66 ++++++++++++++++++----------------- po/ku.po | 66 ++++++++++++++++++----------------- po/lt.po | 66 ++++++++++++++++++----------------- po/mr.po | 66 ++++++++++++++++++----------------- po/nb.po | 66 ++++++++++++++++++----------------- po/ne.po | 66 ++++++++++++++++++----------------- po/nl.po | 66 ++++++++++++++++++----------------- po/nn.po | 66 ++++++++++++++++++----------------- po/pl.po | 66 ++++++++++++++++++----------------- po/pt.po | 66 ++++++++++++++++++----------------- po/pt_BR.po | 66 ++++++++++++++++++----------------- po/ro.po | 66 ++++++++++++++++++----------------- po/ru.po | 66 ++++++++++++++++++----------------- po/sk.po | 66 ++++++++++++++++++----------------- po/sl.po | 66 ++++++++++++++++++----------------- po/sv.po | 66 ++++++++++++++++++----------------- po/th.po | 66 ++++++++++++++++++----------------- po/tl.po | 66 ++++++++++++++++++----------------- po/tr.po | 66 ++++++++++++++++++----------------- po/uk.po | 66 ++++++++++++++++++----------------- po/vi.po | 66 ++++++++++++++++++----------------- po/zh_CN.po | 66 ++++++++++++++++++----------------- po/zh_TW.po | 66 ++++++++++++++++++----------------- 55 files changed, 1978 insertions(+), 1749 deletions(-) diff --git a/configure.ac b/configure.ac index 8c6810511..445f5c5e4 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.14.3~exp3" +PACKAGE_VERSION="0.9.14.3~exp4" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index b140cd7cd..0d3c97485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.14.3~exp4) experimental; urgency=medium + + * implement deb822 suggestions by Anthony Towns and Julian Andres Klode: + - add Description tag for deb822 sources + - add support for Enabled: no in deb822 sources.list + - add support for multiple URIs in deb822 style sources.list + - add support for multipl types in one line + * add integration test for apt search and apt show + * do not ignore ioctl(TIOCSCTTY) errors + + -- Michael Vogt <mvo@debian.org> Wed, 22 Jan 2014 18:59:07 +0100 + apt (0.9.14.3~exp3) experimental; urgency=low * implement deb822 suggestions by donkult (thanks!): diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 47763c4c1..8ed15f199 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.14.3~exp3"> +<!ENTITY apt-product-version "0.9.14.3~exp4"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 039e07a24..cf1661294 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.14.3~exp3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1132,7 +1132,7 @@ 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:275 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609 +#: 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 msgid "See Also" msgstr "" @@ -3624,7 +3624,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 apt-ftparchive.1.xml:598 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598 msgid "Examples" msgstr "" @@ -4711,16 +4711,21 @@ msgstr "" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -4733,7 +4738,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -4746,7 +4751,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 msgid "" "<literal>suite</literal> may also contain a variable, " "<literal>$(ARCH)</literal> which expands to the Debian architecture (such as " @@ -4758,7 +4763,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 msgid "" "In the traditional style sources.list format since only one distribution can " "be specified per line it may be necessary to have multiple lines for the " @@ -4774,7 +4779,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -4785,7 +4790,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> " "can be used to specify for which architectures information should be " @@ -4794,7 +4799,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 msgid "" "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> " "and " @@ -4804,7 +4809,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the " @@ -4816,7 +4821,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -4825,12 +4830,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -4840,17 +4845,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -4858,7 +4863,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media " "swapping. Use the &apt-cdrom; program to create cdrom entries in the source " @@ -4866,7 +4871,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format " @@ -4877,7 +4882,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual " @@ -4890,7 +4895,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -4899,7 +4904,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -4908,12 +4913,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme " @@ -4925,42 +4930,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -4968,7 +4973,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -4976,33 +4981,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -5011,19 +5016,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under " @@ -5035,7 +5040,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index dad4c3f33..efcbfdda1 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+0100\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1572,7 +1572,7 @@ 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-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:275 +#: 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" @@ -5210,7 +5210,7 @@ msgstr "" "filename> gelesenen Anbieter aus." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Beispiele" @@ -6716,16 +6716,21 @@ msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -6738,7 +6743,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 #, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " @@ -6770,7 +6775,7 @@ msgstr "" "angegeben sein." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 #, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" @@ -6799,7 +6804,7 @@ msgstr "" "Architektur generieren." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 #, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " @@ -6840,7 +6845,7 @@ msgstr "" "niedriger Bandbreite hauszuhalten." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6858,7 +6863,7 @@ msgstr "" "stillschweigend ignoriert werden." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6874,7 +6879,7 @@ msgstr "" "heruntergeladen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6896,7 +6901,7 @@ msgstr "" "heruntergeladen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6914,7 +6919,7 @@ msgstr "" "korrekt authentifizierte Quellen als nicht authentifiziert." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6928,12 +6933,12 @@ msgstr "" "Rechnern, zum Beispiel)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "Einige Beispiele:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6945,17 +6950,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "URI-Beschreibung" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "Die derzeit zulässigen URI-Typen sind:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6966,7 +6971,7 @@ msgstr "" "lokale Spiegel oder Archive." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6976,7 +6981,7 @@ msgstr "" "der Quellenliste zu erstellen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6993,7 +6998,7 @@ msgstr "" "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -7015,7 +7020,7 @@ msgstr "" "benutzen, werden ignoriert." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -7028,7 +7033,7 @@ msgstr "" "Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -7042,12 +7047,12 @@ msgstr "" "<command>find</command> und <command>dd</command> verwandt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "weitere zulässige URI-Typen hinzufügen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7066,7 +7071,7 @@ msgstr "" "Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7075,37 +7080,37 @@ msgstr "" "jason/debian für stable/main, stable/contrib und stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution " "benutzt." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "Quellzeile für obiges" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7116,7 +7121,7 @@ msgstr "" "<literal>amd64</literal> und <literal>armel</literal> holt." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7126,7 +7131,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7135,13 +7140,13 @@ msgstr "" "den hamm/main-Bereich zu benutzen." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7151,13 +7156,13 @@ msgstr "" "benutzen." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7171,19 +7176,19 @@ msgstr "" "für beide Quellzeilen benutzt." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7203,7 +7208,7 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/es.po b/doc/po/es.po index 9debc5967..c85b67e51 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+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" @@ -1648,7 +1648,7 @@ 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-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:275 +#: 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" @@ -5240,7 +5240,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Ejemplos" @@ -6740,16 +6740,21 @@ msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -6762,7 +6767,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 #, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " @@ -6793,7 +6798,7 @@ msgstr "" "<literal>distribución</literal> no define una ruta exacta." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 #, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" @@ -6822,7 +6827,7 @@ msgstr "" "sistema." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 #, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " @@ -6862,7 +6867,7 @@ msgstr "" "aprovechar mejor el ancho de banda." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6879,7 +6884,7 @@ msgstr "" "ignoran silenciosamente):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6894,7 +6899,7 @@ msgstr "" "arquitecturas definidas por la opción <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6915,7 +6920,7 @@ msgstr "" "arquitecturas definidas por la opción <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6933,7 +6938,7 @@ msgstr "" "autenticadas no lo están." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6946,12 +6951,12 @@ msgstr "" "seguidos por servidores de Internet distantes, por ejemplo)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "Algunos ejemplos:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6963,17 +6968,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "Especificación del URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "Los tipos de URI permitidos actualmente son:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6984,7 +6989,7 @@ msgstr "" "particiones montadas mediante NFS y réplicas o archivos de paquetes locales." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6994,7 +6999,7 @@ msgstr "" "list»." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -7012,7 +7017,7 @@ msgstr "" "autenticación no es seguro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -7033,7 +7038,7 @@ msgstr "" "fichero de configuración." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -7046,7 +7051,7 @@ msgstr "" "permite realizar la copia de ficheros con APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -7060,12 +7065,12 @@ msgstr "" "transferencia de ficheros desde la máquina remota." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "Añadir más tipos de URI reconocidos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7084,7 +7089,7 @@ msgstr "" "debtorrent, consulte &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7093,36 +7098,36 @@ msgstr "" "para «stable/main», «stable/contrib», y «stable/non-free»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Como arriba, excepto que usa la distribución «unstable» (en desarrollo)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "Línea para obtener el código fuente desde la ubicación anterior." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7133,7 +7138,7 @@ msgstr "" "obtiene <literal>amd64</literal> y <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7143,7 +7148,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7152,13 +7157,13 @@ msgstr "" "usa sólo la sección «hamm/main»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7167,13 +7172,13 @@ msgstr "" "del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7186,19 +7191,19 @@ msgstr "" "filename>, se usará sólo una sesión FTP para ambas." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7217,7 +7222,7 @@ msgstr "" "tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/fr.po b/doc/po/fr.po index de8e83d68..b47d1ea50 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+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" @@ -1567,7 +1567,7 @@ 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-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:275 +#: 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" @@ -5196,7 +5196,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Exemples" @@ -6685,16 +6685,21 @@ msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -6707,7 +6712,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 #, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " @@ -6739,7 +6744,7 @@ msgstr "" "être présent." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 #, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" @@ -6767,7 +6772,7 @@ msgstr "" "literal> crée automatiquement un URI en fonction de l'architecture effective." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 #, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " @@ -6807,7 +6812,7 @@ msgstr "" "tirer plus efficacement parti des sites à faible bande passante." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6824,7 +6829,7 @@ msgstr "" "ignorés silencieusement) :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6839,7 +6844,7 @@ msgstr "" "Architectures</literal> sera téléchargée." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6860,7 +6865,7 @@ msgstr "" "Architectures</literal> sera téléchargée." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6878,7 +6883,7 @@ msgstr "" "authentifiées comme non authentifiées." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6891,12 +6896,12 @@ msgstr "" "les hôtes distants." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "Exemples :" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6908,17 +6913,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "Spécification des URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "Les types d'URI actuellement reconnues sont :" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6929,7 +6934,7 @@ msgstr "" "avec les montages NFS, les miroirs et les archives locaux." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6939,7 +6944,7 @@ msgstr "" "pour créer des entrées dans la liste des sources." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6956,7 +6961,7 @@ msgstr "" "Notez qu'il s'agit d'une méthode d'authentification peu sûre." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6978,7 +6983,7 @@ msgstr "" "configuration seront ignorés." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6992,7 +6997,7 @@ msgstr "" "des fichiers avec APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -7006,12 +7011,12 @@ msgstr "" "sont utilisées pour l'accès aux fichiers de la machine distante." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "ajout de types d'URI supplémentaires reconnues" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7030,7 +7035,7 @@ msgstr "" "disponibles (voir &apt-transport-debtorrent;)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7039,37 +7044,37 @@ msgstr "" "debian pour stable/main, stable/contrib et stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Comme ci-dessus, excepté que cette ligne utilise la distribution " "« unstable » (développement)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "La précédente ligne, mais pour les sources." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7080,7 +7085,7 @@ msgstr "" "<literal>amd64</literal> et <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7090,7 +7095,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7099,13 +7104,13 @@ msgstr "" "n'utiliser que la section hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7114,13 +7119,13 @@ msgstr "" "répertoire debian, et n'utiliser que la section &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7133,19 +7138,19 @@ msgstr "" "apparaissent, une seule session FTP sera utilisée pour les deux lignes." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7165,7 +7170,7 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/it.po b/doc/po/it.po index 042abbc0b..59385473d 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+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" @@ -1611,7 +1611,7 @@ 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-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:275 +#: 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" @@ -5215,7 +5215,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Esempi" @@ -6722,16 +6722,21 @@ msgstr "deb [ opzioni ] uri distribuzione [componente1] [componente2] [...]" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -6744,7 +6749,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 #, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " @@ -6776,7 +6781,7 @@ msgstr "" "<literal>componente</literal>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 #, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" @@ -6804,7 +6809,7 @@ msgstr "" "automaticamente un URI con l'architettura corrente." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 #, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " @@ -6845,7 +6850,7 @@ msgstr "" "larghezza di banda." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6862,7 +6867,7 @@ msgstr "" "supportate verranno ignorate in modo silenzioso):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6877,7 +6882,7 @@ msgstr "" "Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6898,7 +6903,7 @@ msgstr "" "Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6915,7 +6920,7 @@ msgstr "" "tratta anche le fonti correttamente autenticate come non autenticate." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6928,12 +6933,12 @@ msgstr "" "in una rete locale, seguiti da host Internet distanti)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "Alcuni esempi:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6945,17 +6950,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "Specificare URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "I tipi di URI attualmente riconosciuti sono:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6966,7 +6971,7 @@ msgstr "" "archivi locali." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6976,7 +6981,7 @@ msgstr "" "delle fonti." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6993,7 +6998,7 @@ msgstr "" "è un metodo di autenticazione non sicuro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -7013,7 +7018,7 @@ msgstr "" "HTTP specificati nel file di configurazione verranno ignorati." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -7026,7 +7031,7 @@ msgstr "" "rimovibili, per copiare i file nelle varie posizioni con APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -7040,12 +7045,12 @@ msgstr "" "command> e <command>dd</command>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "aggiungere ulteriori tipi di URI riconoscibili" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7064,7 +7069,7 @@ msgstr "" "debtorrrent; vedere &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7073,37 +7078,37 @@ msgstr "" "debian per stable/main, stable/contrib e stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/gianni/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Come sopra, tranne per il fatto che usa la distribuzione unstable (di " "sviluppo)" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/gianni/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "Riga per i sorgenti corrispondente alla precedente" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7114,7 +7119,7 @@ msgstr "" "<literal>amd64</literal> e <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7124,7 +7129,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7133,13 +7138,13 @@ msgstr "" "hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7148,13 +7153,13 @@ msgstr "" "e usa solo l'area &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7167,19 +7172,19 @@ msgstr "" "usata una sola sessione FTP per entrambe le righe." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7198,7 +7203,7 @@ msgstr "" "modo.] <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/ja.po b/doc/po/ja.po index f877f2935..c77ab011a 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+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" @@ -1559,7 +1559,7 @@ 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:275 +#: 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" @@ -4978,7 +4978,7 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "サンプル" @@ -6432,16 +6432,21 @@ msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コ #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -6454,7 +6459,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 #, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " @@ -6485,7 +6490,7 @@ msgstr "" "とつは <literal>component</literal> を指定しなければなりません。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 #, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" @@ -6513,7 +6518,7 @@ msgstr "" "チャで URI を自動的に生成します。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 #, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " @@ -6550,7 +6555,7 @@ msgstr "" "るホストへは、接続を並行して行うようにもしています。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6566,7 +6571,7 @@ msgstr "" "す)。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6580,7 +6585,7 @@ msgstr "" "literal> オプションに定義してある、全アーキテクチャをダウンロードします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6600,7 +6605,7 @@ msgstr "" "literal> オプションに定義してある、全アーキテクチャをダウンロードします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6617,7 +6622,7 @@ msgstr "" "認証として扱います。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6630,12 +6635,12 @@ msgstr "" "しょう。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "例:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6647,17 +6652,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "URI の仕様" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "現在認識できる URI タイプは以下のとおりです。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6667,7 +6672,7 @@ msgstr "" "にします。これは NFS マウントやローカルミラーで便利です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6677,7 +6682,7 @@ msgstr "" "グラムを使用してください。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6693,7 +6698,7 @@ msgstr "" "指定してください。この認証方法は安全ではないことに注意してください。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6712,7 +6717,7 @@ msgstr "" "す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6724,7 +6729,7 @@ msgstr "" "用していて、APT でコピーを行う場合に便利です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6738,12 +6743,12 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "さらに認識できる URI タイプの追加" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -6761,7 +6766,7 @@ msgstr "" "transport-debtorrent; を参照してください。" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -6770,35 +6775,35 @@ msgstr "" "free 用のローカル (または NFS) アーカイブを使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "上記と同様ですが、不安定版 (開発版) を使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "上記のソース行は以下のようになります。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -6809,7 +6814,7 @@ msgstr "" "<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -6819,7 +6824,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -6828,13 +6833,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -6843,13 +6848,13 @@ msgstr "" "&stable-codename;/contrib のみを使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -6862,19 +6867,19 @@ msgstr "" "つだけになります。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -6893,7 +6898,7 @@ msgstr "" "<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/pl.po b/doc/po/pl.po index 5d66ac29c..a9b6a2ed1 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+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" @@ -1642,7 +1642,7 @@ 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-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:275 +#: 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" @@ -4644,7 +4644,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Przykłady" @@ -6137,16 +6137,21 @@ msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -6159,7 +6164,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 #, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " @@ -6190,7 +6195,7 @@ msgstr "" "<literal>komponent</literal>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 #, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" @@ -6219,7 +6224,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 #, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " @@ -6260,7 +6265,7 @@ msgstr "" "sieciach o niskiej przepustowości łączy." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6277,7 +6282,7 @@ msgstr "" "wypisywania żadnego ostrzeżenia):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6292,7 +6297,7 @@ msgstr "" "w opcji konfiguracji <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6313,7 +6318,7 @@ msgstr "" "w opcji konfiguracji <literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6331,7 +6336,7 @@ msgstr "" "niezautentykowane." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6345,12 +6350,12 @@ msgstr "" "komputerami w Internecie)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "Kilka przykładów:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6362,17 +6367,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "Określanie URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "Obecnie rozpoznawane są następujące typy URI:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6383,7 +6388,7 @@ msgstr "" "archiwów." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6393,7 +6398,7 @@ msgstr "" "list." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6410,7 +6415,7 @@ msgstr "" "bezpieczny." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6430,7 +6435,7 @@ msgstr "" "konfiguracyjnym serwery proxy używające HTTP zostaną zignorowane." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6443,7 +6448,7 @@ msgstr "" "do skopiowania plików przy użyciu APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6457,12 +6462,12 @@ msgstr "" "przetransferowania plików ze zdalnego komputera." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "dodawanie innych rozpoznawanych typów URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -6481,7 +6486,7 @@ msgstr "" "zobaczyć &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -6490,36 +6495,36 @@ msgstr "" "debian dla zasobów stable/main, stable/contrib i stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "Linie źródeł dla powyższego przykładu" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -6530,7 +6535,7 @@ msgstr "" "literal> i <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -6540,7 +6545,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -6549,13 +6554,13 @@ msgstr "" "org i dystrybucji hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -6564,13 +6569,13 @@ msgstr "" "katalogu debian i używa tylko dystrybucji &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -6583,19 +6588,19 @@ msgstr "" "to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -6614,7 +6619,7 @@ msgstr "" "nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache;, &apt-conf;" diff --git a/doc/po/pt.po b/doc/po/pt.po index c9a325bf0..f51bc327a 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+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" @@ -1595,7 +1595,7 @@ 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-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:275 +#: 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" @@ -5163,7 +5163,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Exemplos" @@ -6658,16 +6658,21 @@ msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -6680,7 +6685,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 #, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " @@ -6712,7 +6717,7 @@ msgstr "" "presente." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 #, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" @@ -6740,7 +6745,7 @@ msgstr "" "gerar automaticamente um URI com a arquitectura actual." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 #, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " @@ -6780,7 +6785,7 @@ msgstr "" "sites com baixa largura de banda." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -6797,7 +6802,7 @@ msgstr "" "definições não suportadas serão ignoradas em silêncio):" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -6812,7 +6817,7 @@ msgstr "" "<literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 #, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" @@ -6833,7 +6838,7 @@ msgstr "" "<literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -6850,7 +6855,7 @@ msgstr "" "lida com fontes mesmo actualmente autenticadas como não sendo autênticas." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -6864,12 +6869,12 @@ msgstr "" "Internet, por exemplo)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 msgid "Some examples:" msgstr "Alguns exemplos:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6881,17 +6886,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "Especificação da URI" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "Os tipos de URI actualmente reconhecidos são:" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6902,7 +6907,7 @@ msgstr "" "arquivos locais." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -6912,7 +6917,7 @@ msgstr "" "fontes." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6929,7 +6934,7 @@ msgstr "" "método de autenticação seguro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6950,7 +6955,7 @@ msgstr "" "configuração serão ignorados." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6963,7 +6968,7 @@ msgstr "" "ficheiros com o APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -6977,12 +6982,12 @@ msgstr "" "ficheiros a partir da máquina remota." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "adicionando mais tipos de URI reconhecíveis" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -7001,7 +7006,7 @@ msgstr "" "exemplo o debtorrent - veja &apt-transport-debtorrent;." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -7010,36 +7015,36 @@ msgstr "" "para stable/main, stable/contrib, e stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "Linha de fonte para o referido acima" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -7050,7 +7055,7 @@ msgstr "" "<literal>amd64</literal> e <literal>armel</literal>." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -7060,7 +7065,7 @@ msgstr "" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -7069,13 +7074,13 @@ msgstr "" "hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -7084,13 +7089,13 @@ msgstr "" "usa apenas a área &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7103,19 +7108,19 @@ msgstr "" "uma única sessão FTP para ambas linhas de recurso." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7134,7 +7139,7 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 695d8dbea..c49ebb181 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:01+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" @@ -1120,7 +1120,7 @@ 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:275 +#: 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 #, fuzzy @@ -3615,7 +3615,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 +#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 #, fuzzy msgid "Examples" @@ -5112,16 +5112,21 @@ msgstr "" #: sources.list.5.xml:86 #, no-wrap msgid "" -" Type: deb\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" " Sections: component1 component2\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" "\n" -" Type: deb-src\n" -" URI: http://example.com\n" -" Suites: stable\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" " Sections: component1 component2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" " [option1]: [option1-value]\n" " " msgstr "" @@ -5134,7 +5139,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:100 +#: sources.list.5.xml:105 msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -5147,7 +5152,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:109 +#: sources.list.5.xml:114 msgid "" "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" "literal> which expands to the Debian architecture (such as <literal>amd64</" @@ -5159,7 +5164,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:122 msgid "" "In the traditional style sources.list format since only one distribution can " "be specified per line it may be necessary to have multiple lines for the " @@ -5175,7 +5180,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:131 +#: sources.list.5.xml:136 msgid "" "<literal>options</literal> is always optional and needs to be surrounded by " "square brackets. It can consist of multiple settings in the form " @@ -5186,7 +5191,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:137 +#: sources.list.5.xml:142 msgid "" "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> can be used to specify for which architectures " @@ -5196,7 +5201,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:141 +#: sources.list.5.xml:146 msgid "" "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>," @@ -5205,7 +5210,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:144 +#: sources.list.5.xml:149 msgid "" "<literal>trusted=yes</literal> can be set to indicate that packages from " "this source are always authenticated even if the <filename>Release</" @@ -5216,7 +5221,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:151 +#: sources.list.5.xml:156 msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " @@ -5225,13 +5230,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:156 +#: sources.list.5.xml:161 #, fuzzy msgid "Some examples:" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:158 +#: sources.list.5.xml:163 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -5240,17 +5245,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:164 +#: sources.list.5.xml:169 msgid "URI specification" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:166 +#: sources.list.5.xml:171 msgid "The currently recognized URI types are:" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:170 +#: sources.list.5.xml:175 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -5258,14 +5263,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:177 +#: sources.list.5.xml:182 msgid "" "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:189 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -5276,7 +5281,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:195 +#: sources.list.5.xml:200 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -5289,7 +5294,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:207 +#: sources.list.5.xml:212 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -5298,7 +5303,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:214 +#: sources.list.5.xml:219 msgid "" "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access " "the files as a given user. Prior configuration of rhosts or RSA keys is " @@ -5307,12 +5312,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:221 +#: sources.list.5.xml:226 msgid "adding more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:228 msgid "" "APT can be extended with more methods shipped in other optional packages, " "which should follow the naming scheme <package>apt-transport-" @@ -5324,42 +5329,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:240 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:237 +#: sources.list.5.xml:242 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:239 +#: sources.list.5.xml:244 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:240 +#: sources.list.5.xml:245 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:242 +#: sources.list.5.xml:247 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:243 +#: sources.list.5.xml:248 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:245 +#: sources.list.5.xml:250 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -5367,7 +5372,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:247 +#: sources.list.5.xml:252 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -5375,33 +5380,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:250 +#: sources.list.5.xml:255 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:252 +#: sources.list.5.xml:257 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:254 +#: sources.list.5.xml:259 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:256 +#: sources.list.5.xml:261 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:258 +#: sources.list.5.xml:263 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -5410,19 +5415,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:262 +#: sources.list.5.xml:267 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:271 +#: sources.list.5.xml:276 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:264 +#: sources.list.5.xml:269 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -5434,7 +5439,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:276 +#: sources.list.5.xml:281 #, fuzzy msgid "&apt-cache; &apt-conf;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/po/ar.po b/po/ar.po index df852f62f..c2e5b5898 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -546,7 +546,7 @@ msgstr "%s هي النسخة الأحدث.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1480,8 +1480,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2495,82 +2495,82 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" @@ -3153,57 +3153,61 @@ msgstr "التحضير لإزالة %s بالكامل" msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "تعذرت الكتابة إلى %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ast.po b/po/ast.po index 06a3a5987..8535b4737 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -652,7 +652,7 @@ msgstr "%s yá ta na versión más nueva.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ellí" @@ -1607,8 +1607,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2705,85 +2705,85 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinia %u enforma llarga na llista d'oríxenes %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" @@ -3400,33 +3400,37 @@ msgstr "Preparándose pa desinstalar dafechu %s" msgid "Completely removed %s" msgstr "Desinstalóse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nun se pue escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependencies - déxase ensin configurar" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3434,7 +3438,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que " "siguió dende un fallu previu" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3442,7 +3446,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3450,7 +3454,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "memoria" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3459,7 +3463,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/bg.po b/po/bg.po index 649a0a66a..b2891596b 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -659,7 +659,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" @@ -1641,8 +1641,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2743,89 +2743,89 @@ msgstr "Неуспех при анализирането на пакетен ф msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма " "стойност)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." @@ -3454,35 +3454,39 @@ msgstr "Подготовка за пълно премахване на %s" msgid "Completely removed %s" msgstr "%s е напълно премахнат" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неуспех при записа на %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Операцията е прекъсната" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Поради достигане на максималния брой доклади (MaxReports) не е записан нов " "доклад за зависимостите." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "отлагане на настройката поради неудовлетворени зависимости" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3490,7 +3494,7 @@ msgstr "" "Доклад за зависимостите не е записан защото съобщението за грешка е породено " "от друга грешка." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3498,7 +3502,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3506,7 +3510,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчна оперативна памет" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3515,7 +3519,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/bs.po b/po/bs.po index a7c3886c1..842e8d9aa 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -552,7 +552,7 @@ msgstr "" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1475,8 +1475,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2490,82 +2490,82 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" @@ -3146,57 +3146,61 @@ msgstr "" msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ne mogu zapisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ca.po b/po/ca.po index d2d5d26ec..50754b3b3 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -663,7 +663,7 @@ msgstr "%s ja estava no retingut.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" @@ -1629,8 +1629,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2728,85 +2728,85 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" @@ -3441,33 +3441,37 @@ msgstr "S'està preparant per a suprimir completament el paquet %s" msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No es pot escriure en %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "S'ha interromput l'operació abans que pogués finalitzar" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "S'han produït problemes de depències, es deixa sense configurar" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3475,7 +3479,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que és un error " "consequent de una fallida anterior." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3483,7 +3487,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3491,7 +3495,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3500,7 +3504,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/cs.po b/po/cs.po index 941306b86..fc9092ec1 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -642,7 +642,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" @@ -1617,8 +1617,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2702,82 +2702,82 @@ msgstr "Nelze zpracovat soubor %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" @@ -3387,34 +3387,38 @@ msgstr "Připravuji úplné odstranění %s" msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nelze zapsat do %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Operace byla přerušena dříve, než mohla skončit" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problémy se závislostmi - ponechávám nezkonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3422,7 +3426,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "se jedná o chybu způsobenou předchozí chybou." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3430,7 +3434,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3438,7 +3442,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněnou pamětí." -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3447,7 +3451,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/cy.po b/po/cy.po index 1d924b05e..ffb6a9200 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -666,7 +666,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -1633,8 +1633,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2749,87 +2749,87 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" @@ -3443,57 +3443,61 @@ msgstr "Yn agor y ffeil cyfluniad %s" msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/da.po b/po/da.po index cd2a76ef6..c83217d52 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -654,7 +654,7 @@ msgstr "%s var allerede ikke i bero.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" @@ -1643,8 +1643,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2735,82 +2735,82 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Åbner %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" @@ -3425,34 +3425,38 @@ msgstr "Gør klar til at fjerne %s helt" msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive log (%s)" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "Er /dev/pts monteret?" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "Er standardud en terminal?" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Handling blev afbrudt før den kunne afsluttes" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3460,14 +3464,14 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en " "opfølgningsfejl fra en tidligere fejl." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3475,7 +3479,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3483,7 +3487,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale " "system" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl" diff --git a/po/de.po b/po/de.po index 10bca6f83..55d969669 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -675,7 +675,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" @@ -1674,8 +1674,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2788,83 +2788,83 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet." -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." @@ -3510,35 +3510,39 @@ msgstr "Vollständiges Entfernen von %s wird vorbereitet." msgid "Completely removed %s" msgstr "%s vollständig entfernt" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Schreiben nach %s nicht möglich" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " "erreicht ist." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3546,7 +3550,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf " "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3554,7 +3558,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3562,7 +3566,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen erschöpftem Arbeitsspeicher hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3571,7 +3575,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/dz.po b/po/dz.po index fcd13c1a3..2fa0dbfe4 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -644,7 +644,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" @@ -1594,8 +1594,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2693,82 +2693,82 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" @@ -3371,57 +3371,61 @@ msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བས msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/el.po b/po/el.po index 4ad135c9c..49fc970fa 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -656,7 +656,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" @@ -1614,8 +1614,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2716,82 +2716,82 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " @@ -3400,57 +3400,61 @@ msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" msgid "Completely removed %s" msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Αδύνατη η εγγραφή στο %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/es.po b/po/es.po index 7ae80ff02..d00d39a40 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -716,7 +716,7 @@ msgstr "%s ya está en su versión más reciente.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba allí" @@ -1680,8 +1680,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2788,88 +2788,88 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene " "asociado un valor)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" @@ -3500,35 +3500,39 @@ msgstr "Preparándose para eliminar completamente %s" msgid "Completely removed %s" msgstr "Se borró completamente %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No se puede escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de " "«MaxReports»" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - dejando sin instalar" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3536,7 +3540,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que es " "un mensaje de error asociado a un fallo previo." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3544,7 +3548,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3552,7 +3556,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica un " "error de memoria excedida" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3561,7 +3565,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/eu.po b/po/eu.po index b07f1a948..98fd03418 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -643,7 +643,7 @@ msgstr "%s bertsiorik berriena da jada.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" @@ -1602,8 +1602,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2695,82 +2695,82 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" @@ -3370,57 +3370,61 @@ msgstr "%s guztiz ezabatzeko prestatzen" msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s : ezin da idatzi" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/fi.po b/po/fi.po index 958fc756c..e88e95087 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -638,7 +638,7 @@ msgstr "%s on jo uusin versio.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" @@ -1594,8 +1594,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2686,82 +2686,82 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" @@ -3362,57 +3362,61 @@ msgstr "Valmistaudutaan poistamaan %s kokonaan" msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/fr.po b/po/fr.po index 64ce07802..efd774afc 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -675,7 +675,7 @@ msgstr "%s était déjà marqué comme non figé.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" @@ -1683,8 +1683,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2795,93 +2795,93 @@ msgstr "Impossible de traiter le fichier %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser " "[option])" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une " "affectation)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de " "valeur)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" @@ -3532,33 +3532,37 @@ msgstr "Préparation de la suppression complète de %s" msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossible d'écrire sur %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3566,14 +3570,14 @@ msgstr "" "Aucun rapport « apport » n'a été créé car le message d'erreur indique une " "erreur consécutive à un échec précédent." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3581,7 +3585,7 @@ msgstr "" "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3589,7 +3593,7 @@ msgid "" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/gl.po b/po/gl.po index 57343335a..47dcd9197 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -661,7 +661,7 @@ msgstr "%s xa é a versión máis recente.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" @@ -1631,8 +1631,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2735,86 +2735,86 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal construída na lista de orixes %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de orixes %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal construída na lista de orixes %s (tipo)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" @@ -3442,35 +3442,39 @@ msgstr "Preparándose para retirar %s completamente" msgid "Completely removed %s" msgstr "Retirouse %s completamente" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Non é posíbel escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Non se escribiu ningún informe de Apport porque xa se acadou o nivel " "MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - déixase sen configurar" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3478,7 +3482,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que " "é un error provinte dun fallo anterior." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3486,7 +3490,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3494,7 +3498,7 @@ msgstr "" "Non se escribiu un informe de contribución porque a mensaxe de erro indica " "un erro de falta de memoria" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3503,7 +3507,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/hu.po b/po/hu.po index a70700de7..431128f89 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -656,7 +656,7 @@ msgstr "%s eddig sem volt visszafogva.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Nem található a(z) %s, a várakozás után sem" @@ -1635,8 +1635,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2735,92 +2735,92 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] " "feldolgozhatatlan)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl " "rövid)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "érvényes hozzárendelés)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "tartalmaz kulcsot)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak " "nincs értéke)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" @@ -3440,33 +3440,37 @@ msgstr "%s teljes eltávolításának előkészítése" msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nem lehet írni ebbe: %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "függőségi hibák - a csomag beállítatlan maradt" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3474,7 +3478,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba " "egy korábbi hiba következménye." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3482,7 +3486,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a " "lemez" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3490,7 +3494,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási " "hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3498,7 +3502,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren " "lévő hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/it.po b/po/it.po index 6f0d90f13..ba95d59e8 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -669,7 +669,7 @@ msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" @@ -1665,8 +1665,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2777,92 +2777,92 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file di pacchetto %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non " "analizzabile)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo " "corta)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è " "un'assegnazione)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una " "chiave)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non " "ha un valore)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La riga %lu nel file %s non è corretta (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La riga %lu nel file %s non è corretta (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La riga %lu nel file %s non è corretta (absolute dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La riga %lu nel file %s non è corretta (dist parse)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Apertura di %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riga %u troppo lunga nel file %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La riga %u nel file %s non è corretta (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" @@ -3502,35 +3502,39 @@ msgstr "Preparazione alla rimozione completa di %s" msgid "Completely removed %s" msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossibile scrivere in %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "L'operazione è stata interrotta prima di essere completata" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " "di MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "Problemi con le dipendenze - Viene lasciato non configurato" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3538,7 +3542,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica la " "presenza di un fallimento precedente." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3546,7 +3550,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3554,7 +3558,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di memoria esaurita" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3563,7 +3567,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ja.po b/po/ja.po index 3ef58b94c..d15236eed 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -661,7 +661,7 @@ msgstr "%s はすでに保留されていません。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" @@ -1634,8 +1634,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2724,86 +2724,86 @@ msgstr "パッケージファイル %s を解釈することができません ( msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" @@ -3430,33 +3430,37 @@ msgstr "%s を完全に削除する準備をしています" msgid "Completely removed %s" msgstr "%s を完全に削除しました" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s に書き込めません" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "操作はそれが完了する前に中断されました" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "MaxReports にすでに達しているため、レポートは書き込まれません" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "依存関係の問題 - 未設定のままにしています" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3464,7 +3468,7 @@ msgstr "" "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" "は書き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3472,7 +3476,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3480,7 +3484,7 @@ msgstr "" "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" "込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3489,7 +3493,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/km.po b/po/km.po index e0944fa9f..83159baab 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -636,7 +636,7 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" @@ -1576,8 +1576,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2665,82 +2665,82 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1 msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "កំពុង​បើក​ %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" @@ -3335,57 +3335,61 @@ msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង msgid "Completely removed %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "មិន​អាច​សរសេរ​ទៅ %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ko.po b/po/ko.po index f768cb179..9c4139434 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -643,7 +643,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" @@ -1592,8 +1592,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2681,83 +2681,83 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" @@ -3361,33 +3361,37 @@ msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" msgid "Completely removed %s" msgstr "%s 패키지를 완전히 지웠습니다" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s에 쓸 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3395,20 +3399,20 @@ msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" "적인 오류입니다." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3416,7 +3420,7 @@ msgid "" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ku.po b/po/ku.po index fc762aff0..3176a8446 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -558,7 +558,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1480,8 +1480,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2508,82 +2508,82 @@ msgstr "Pakêt nehate dîtin %s" msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" @@ -3163,57 +3163,61 @@ msgstr "Bi tevahî rakirina %s tê amadekirin" msgid "Completely removed %s" msgstr "%s bi tevahî hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/lt.po b/po/lt.po index 46e7f2c13..8aa36e261 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -562,7 +562,7 @@ msgstr "%s ir taip jau yra naujausias.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1498,8 +1498,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2597,82 +2597,82 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Atveriama %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" @@ -3258,57 +3258,61 @@ msgstr "Ruošiamasi visiškai pašalinti %s" msgid "Completely removed %s" msgstr "Visiškai pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nepavyko įrašyti į %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/mr.po b/po/mr.po index f77866298..4b837e847 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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 " @@ -632,7 +632,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" @@ -1580,8 +1580,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2669,82 +2669,82 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s उघडत आहे" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " @@ -3347,57 +3347,61 @@ msgstr "%s संपूर्ण काढून टाकण्याची त msgid "Completely removed %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nb.po b/po/nb.po index bdd00052d..abf8d5cfd 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -647,7 +647,7 @@ msgstr "%s er allerede nyeste versjon.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" @@ -1605,8 +1605,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2699,82 +2699,82 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" @@ -3386,33 +3386,37 @@ msgstr "Forbereder å fullstendig slette %s" msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive til %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "avhengighetsproblemer - lar den være uoppsatt" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3420,7 +3424,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en " "følgefeil fra en tidligere feil." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3428,7 +3432,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3436,7 +3440,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for " "minne»-feil" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3445,7 +3449,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ne.po b/po/ne.po index 3d9ecee00..8903feb0f 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -634,7 +634,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" @@ -1577,8 +1577,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2667,82 +2667,82 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" @@ -3338,57 +3338,61 @@ msgstr " %s पूर्ण रुपले हटाउन तयार गर msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %s मा लेख्न असक्षम" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nl.po b/po/nl.po index b9b9794ee..89896ce90 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -659,7 +659,7 @@ msgstr "%s is reeds de nieuwste versie.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" @@ -1625,8 +1625,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2733,83 +2733,83 @@ msgstr "Kon pakketbestand %s niet ontleden (1)" msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" @@ -3440,35 +3440,39 @@ msgstr "Volledige verwijdering van %s wordt voorbereid" msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan niet naar %s schrijven" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen " "(MaxReports) al is bereikt" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problemen met vereisten - wordt niet geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3476,7 +3480,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een " "eerdere mislukking." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3484,7 +3488,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3492,7 +3496,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over onvoldoende-geheugen." -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3501,7 +3505,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nn.po b/po/nn.po index 6ae106e38..6a8b433df 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -641,7 +641,7 @@ msgstr "Den nyaste versjonen av %s er installert fr #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" @@ -1588,8 +1588,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2673,82 +2673,82 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" @@ -3351,57 +3351,61 @@ msgstr "Opnar oppsettsfila %s" msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Klarte ikkje skriva til %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pl.po b/po/pl.po index 537f2b12c..ded03b008 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -663,7 +663,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" @@ -1665,8 +1665,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2766,84 +2766,84 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" @@ -3468,33 +3468,37 @@ msgstr "Przygotowywanie do całkowitego usunięcia %s" msgid "Completely removed %s" msgstr "Pakiet %s został całkowicie usunięty" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nie udało się pisać do %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Operacja została przerwana, zanim mogła zostać zakończona" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3502,7 +3506,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " "przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3510,7 +3514,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3518,7 +3522,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " "braku wolnej pamięci" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3527,7 +3531,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pt.po b/po/pt.po index b114db28d..d17ec00f8 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -659,7 +659,7 @@ msgstr "%s já estava para não manter.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" @@ -1638,8 +1638,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2743,85 +2743,85 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" @@ -3459,33 +3459,37 @@ msgstr "A preparar para remover completamente %s" msgid "Completely removed %s" msgstr "Remoção completa de %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Não conseguiu escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "A operação foi interrompida antes de poder terminar" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependências - deixando por configurar" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3493,7 +3497,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro " "de seguimento de um erro anterior." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3501,7 +3505,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3509,7 +3513,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " "memória esgotada" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3518,7 +3522,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9e5a5c2d0..edb284aa1 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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." @@ -651,7 +651,7 @@ msgstr "%s já é a versão mais nova.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" @@ -1611,8 +1611,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2711,87 +2711,87 @@ msgstr "Impossível analisar arquivo de pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" @@ -3403,57 +3403,61 @@ msgstr "Preparando para remover completamente %s" msgid "Completely removed %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossível escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ro.po b/po/ro.po index 90d46423a..e5be44f06 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -650,7 +650,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" @@ -1616,8 +1616,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2720,82 +2720,82 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" @@ -3408,57 +3408,61 @@ msgstr "Se pregătește ștergerea completă a %s" msgid "Completely removed %s" msgstr "Șters complet %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nu s-a putut scrie în %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ru.po b/po/ru.po index 02a5424e7..4e740f0c2 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -662,7 +662,7 @@ msgstr "%s уже помечен как не зафиксированный.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" @@ -1659,8 +1659,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2767,86 +2767,86 @@ msgstr "Невозможно разобрать содержимое пакет msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет " "значения)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" @@ -3472,33 +3472,37 @@ msgstr "Подготовка к полному удалению %s" msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Невозможно записать в %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Действие прервано до его завершения" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Отчёты apport не записаны, так достигнут MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "проблемы с зависимостями — оставляем ненастроенным" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3506,7 +3510,7 @@ msgstr "" "Отчёты apport не записаны, так как сообщение об ошибке указывает на " "повторную ошибку от предыдущего отказа." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3514,7 +3518,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3522,7 +3526,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "памяти" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3531,7 +3535,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sk.po b/po/sk.po index 350d1e7a7..815684144 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -651,7 +651,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" @@ -1633,8 +1633,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2722,83 +2722,83 @@ msgstr "Súbor %s sa nedá spracovať (1)" msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" @@ -3413,33 +3413,37 @@ msgstr "Pripravuje sa úplné odstránenie %s" msgid "Completely removed %s" msgstr "Balík „%s“ je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Do %s sa nedá zapisovať" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3447,7 +3451,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v " "nadväznosti na predošlé zlyhanie." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3455,7 +3459,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3463,7 +3467,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " "pamäte" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3472,7 +3476,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sl.po b/po/sl.po index 41f2d8266..ad3cae1b9 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -647,7 +647,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" @@ -1632,8 +1632,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2723,88 +2723,88 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče " "razčleniti)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima " "vrednosti)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Odpiranje %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" @@ -3418,34 +3418,38 @@ msgstr "Pripravljanje na popolno odstranitev %s" msgid "Completely removed %s" msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni mogoče pisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "težave odvisnosti - puščanje nenastavljenega" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3453,7 +3457,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " "navezujočo napako iz predhodne napake." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3461,7 +3465,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "polnega diska" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3469,7 +3473,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3477,7 +3481,7 @@ msgstr "" "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo " "na krajevnem sistemu" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sv.po b/po/sv.po index 07fbf7078..fc0243ba1 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -650,7 +650,7 @@ msgstr "%s är redan den senaste versionen.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" @@ -1622,8 +1622,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2724,82 +2724,82 @@ msgstr "Kunde inte tolka paketfilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Rad %lu i källistan %s har fel format ([option] för kort)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" @@ -3417,33 +3417,37 @@ msgstr "Förbereder borttagning av hela %s" msgid "Completely removed %s" msgstr "Tog bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kunde inte skriva till %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "beroendeproblem - lämnar okonfigurerad" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3451,7 +3455,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " "ett efterföljande fel från ett tidigare problem." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3459,7 +3463,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3467,7 +3471,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " "är slut" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3476,7 +3480,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/th.po b/po/th.po index d15bb3ce8..68dc4d5af 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -635,7 +635,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" @@ -1589,8 +1589,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2666,82 +2666,82 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1 msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "กำลังเปิด %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" @@ -3341,59 +3341,63 @@ msgstr "กำลังเตรียมถอดถอน %s อย่าง msgid "Completely removed %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/tl.po b/po/tl.po index 84ddfdc76..c41b32305 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -647,7 +647,7 @@ msgstr "%s ay pinakabagong bersyon na.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" @@ -1600,8 +1600,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2704,82 +2704,82 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" @@ -3391,57 +3391,61 @@ msgstr "Naghahanda upang tanggalin ng lubusan ang %s" msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Hindi makapagsulat sa %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/tr.po b/po/tr.po index bc4947160..2c549d8a5 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -653,7 +653,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s için beklenildi ama o gelmedi" @@ -1631,8 +1631,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2733,94 +2733,94 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)" msgid "Unable to parse package file %s (2)" msgstr "Paket dosyası %s ayrıştırılamadı (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] " "ayrıştırılamıyor)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama " "değil)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin " "anahtarı yok)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s " "anahtarına değer atanmamış)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "%s Açılıyor" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" @@ -3435,34 +3435,38 @@ msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" msgid "Completely removed %s" msgstr "%s tamamen kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s dosyasına yazılamıyor" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "İşlem yarıda kesildi" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3470,14 +3474,14 @@ msgstr "" "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " "kaynaklanan bir hata olduğunu belirtiyor." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3485,7 +3489,7 @@ msgstr "" "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport " "raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3493,7 +3497,7 @@ msgid "" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/uk.po b/po/uk.po index c90ad239b..cff9d1830 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -663,7 +663,7 @@ msgstr "%s вже був незафіксований.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікував на %s, але його там не було" @@ -1651,8 +1651,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2767,84 +2767,84 @@ msgstr "Неможливо проаналізувати файл пакунку msgid "Unable to parse package file %s (2)" msgstr "Неможливо проаналізувати файл пакунку %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Рядок %u є занадто довгим у переліку джерел %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворений рядок %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" @@ -3467,35 +3467,39 @@ msgstr "Підготовка до повного видалення %s" msgid "Completely removed %s" msgstr "Повністю видалено %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неможливо записати в %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Операцію було перервано до того, як вона мала завершитися" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Звіт apport не був записаний, тому що параметр MaxReports вже досягнув " "максимальної величини" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "проблеми з залежностями - залишено неналаштованим" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3503,7 +3507,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " "що ця помилка є наслідком попередньої невдачі." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3511,7 +3515,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3519,7 +3523,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця у пам'яті" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3528,7 +3532,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/vi.po b/po/vi.po index 5f3ab193e..b365fd1f5 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+0100\n" "PO-Revision-Date: 2014-01-01 13:45+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -669,7 +669,7 @@ msgstr "%s đã sẵn được đặt là không giữ lại.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Cần %s nhưng mà không thấy nó ở đây" @@ -1656,8 +1656,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2771,91 +2771,91 @@ msgstr "Không thể phân tích tập tin gói %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " "tích được)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " "gán)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " "trị)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "Đang mở %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." @@ -3476,34 +3476,38 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" msgid "Completely removed %s" msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, c-format msgid "Can not write log (%s)" msgstr "Không thể ghi nhật ký (%s)" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "/dev/pts đã gắn chưa?" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "Đầu ra là thiết bị cuối?" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" "Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3511,14 +3515,14 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " "do một sự thất bại trước đó." -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3526,7 +3530,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " "bộ nhớ”" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3534,7 +3538,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " "thống nội bộ" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7d3269753..5aae99b13 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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" @@ -639,7 +639,7 @@ msgstr "%s 已经是最新的版本了。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" @@ -1574,8 +1574,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2656,82 +2656,82 @@ msgstr "无法解析软件包文件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" @@ -3332,58 +3332,62 @@ msgstr "正在准备完全删除 %s" msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "无法写入 %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 52f96ab81..8f2f085db 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-01-18 21:25+0100\n" +"POT-Creation-Date: 2014-01-22 19:02+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." @@ -632,7 +632,7 @@ msgstr "%s 已經是最新版本了。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: apt-pkg/deb/dpkgpm.cc:1183 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它並不存在" @@ -1571,8 +1571,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254 -#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 +#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2655,82 +2655,82 @@ msgstr "無法辨識套件檔 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" -#: apt-pkg/sourcelist.cc:84 +#: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:144 +#: apt-pkg/sourcelist.cc:155 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:147 +#: apt-pkg/sourcelist.cc:158 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:169 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:167 +#: apt-pkg/sourcelist.cc:178 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:180 +#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" -#: apt-pkg/sourcelist.cc:182 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:185 +#: apt-pkg/sourcelist.cc:196 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" -#: apt-pkg/sourcelist.cc:198 +#: apt-pkg/sourcelist.cc:209 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:309 +#: apt-pkg/sourcelist.cc:320 #, c-format msgid "Opening %s" msgstr "正在開啟 %s" -#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "來源列表 %2$s 中的第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:345 +#: apt-pkg/sourcelist.cc:356 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" -#: apt-pkg/sourcelist.cc:349 +#: apt-pkg/sourcelist.cc:360 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/sourcelist.cc:386 +#: apt-pkg/sourcelist.cc:401 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" @@ -3320,57 +3320,61 @@ msgstr "正在準備完整移除 %s" msgid "Completely removed %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1047 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "無法寫入 %s" -#: apt-pkg/deb/dpkgpm.cc:1045 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1066 +#: apt-pkg/deb/dpkgpm.cc:1071 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1549 +#: apt-pkg/deb/dpkgpm.cc:1559 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1611 +#: apt-pkg/deb/dpkgpm.cc:1621 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 +#: apt-pkg/deb/dpkgpm.cc:1626 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1618 +#: apt-pkg/deb/dpkgpm.cc:1628 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1624 +#: apt-pkg/deb/dpkgpm.cc:1634 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1631 +#: apt-pkg/deb/dpkgpm.cc:1641 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644 +#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1665 +#: apt-pkg/deb/dpkgpm.cc:1675 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -- cgit v1.2.3 From 06293aa79b46efdec96910b2f678ce1cbdecc86d Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 23 Jan 2014 07:52:23 +0100 Subject: Show only the candidate with "apt show" Display only the candidate version with "apt show pkg" but show a notice that there is more to see. --- apt-private/private-cmndline.cc | 4 ++++ apt-private/private-show.cc | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index cbb40d42e..2b6c710d6 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -235,6 +235,10 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm // FIXME: find a better term addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean); } + else if (CmdMatches("show")) + { + addArg('a', "all-versions", "APT::Cache::AllVersions", 0); + } else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd)) { // we have no (supported) command-name overlaps so far, so we call diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 32a49cc5c..9a8386167 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -104,12 +104,20 @@ bool ShowPackage(CommandLine &CmdL) /*{{{*/ { pkgCacheFile CacheFile; CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); - APT::VersionList::Version const select = APT::VersionList::CANDIDATE; + APT::VersionList::Version const select = _config->FindB("APT::Cache::AllVersions", false) ? + APT::VersionList::ALL : APT::VersionList::CANDIDATE; APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver, c1out) == false) return false; + if (select == APT::VersionList::CANDIDATE) + { + APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper); + if (verset_all.size() > verset.size()) + _error->Notice(ngettext("There is %lu additional record. Please use the '-a' switch to see it", "There are %lu additional records. Please use the '-a' switch to see them.", verset_all.size() - verset.size()), verset_all.size() - verset.size()); + } + for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin(); Pkg != helper.virtualPkgs.end(); ++Pkg) { -- cgit v1.2.3 From 0c8b6001694bb0ddf9eb6bc4936151592e1a07fa Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 23 Jan 2014 08:12:02 +0100 Subject: include "Archive-Origin" in the apt show output --- apt-private/private-output.h | 6 +++++- apt-private/private-show.cc | 2 ++ test/integration/test-apt-cli-show | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-private/private-output.h b/apt-private/private-output.h index c3c76bb92..ba04ee221 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -28,7 +28,7 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, bool include_summary=true); - +// helper to describe global state bool ShowList(std::ostream &out, std::string Title, std::string List, std::string VersionsList); void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now); @@ -43,6 +43,10 @@ bool ShowEssential(std::ostream &out,CacheFile &Cache); void Stats(std::ostream &out, pkgDepCache &Dep); +// helpers to display single package data +std::string +GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver); + // prompting bool YnPrompt(bool Default=true); bool AnalPrompt(const char *Text); diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 9a8386167..244347421 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -73,12 +73,14 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, else package_size = _("unknown"); + std::string suite = GetArchiveSuite(CacheFile, V); TFRewriteData RW[] = { {"Conffiles",0}, {"Description",0}, {"Description-md5",0}, {"Installed-Size", installed_size.c_str(), 0}, {"Size", package_size.c_str(), "Download-Size"}, + {"Archive-Origin", suite.c_str(), 0}, {} }; if(TFRewrite(stdout, Tags, NULL, RW) == false) diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index bbb2de7ef..ba56e3260 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -25,6 +25,7 @@ Architecture: all Version: 1.0 Filename: pool/main/foo/foo_1.0_all.deb Download-Size: unknown +Archive-Origin: unstable Description: Some description That has multiple lines " apt show foo -- cgit v1.2.3 From 36e6c8e36f44355d7bbd78747198ec924dfe9910 Mon Sep 17 00:00:00 2001 From: Chris Leick <c.leick@vollbio.de> Date: Fri, 24 Jan 2014 12:37:24 +0100 Subject: update german manpage translation --- doc/po/de.po | 133 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 64 insertions(+), 69 deletions(-) diff --git a/doc/po/de.po b/doc/po/de.po index 8983abb64..67c3f992b 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,14 @@ # Translation of apt-doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # This file is distributed under the same license as the apt-doc package. -# Chris Leick <c.leick@vollbio.de>, 2009-2012. +# Chris Leick <c.leick@vollbio.de>, 2009-2014. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.7\n" +"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: 2013-12-29 17:01+0100\n" -"PO-Revision-Date: 2012-06-25 22:49+0100\n" +"POT-Creation-Date: 2014-01-24 12:29+0100\n" +"PO-Revision-Date: 2014-01-21 20:59+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -1334,6 +1334,14 @@ msgid "" "will never remove packages, only allow adding new ones. Configuration Item: " "<literal>APT::Get::Upgrade-Allow-New</literal>." msgstr "" +"erlaubt das Installieren neuer Pakete, wenn es zusammen mit " +"<literal>upgrade</literal> benutzt wird. Dies ist nützlich, falls das " +"Aktualisieren eines installierten Pakets zur Installation neue " +"Abhängigkeiten hat. Anstatt das Paket zurückzuhalten, wird <literal>upgrade</" +"literal> ein Upgrade des Pakets durchführen und die neuen Abhängigkeiten " +"installieren. Beachten Sie, dass <literal>upgrade</literal> mit dieser " +"Option niemals Pakete entfernen, sondern nur das Hinzufügen neuer gestatten " +"wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:407 @@ -1553,6 +1561,7 @@ msgstr "" "fragen. Dies ist für Werkzeuge wie pbuilder nützlich. Konfigurationselement: " "<literal>APT::Get::AllowUnauthenticated</literal>." +# FIXME s/Item/Items/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:527 msgid "" @@ -1562,6 +1571,12 @@ msgid "" "Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</" "literal>." msgstr "" +"zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn " +"Pakete installiert beziehungsweise entfernt werden oder ein Upgrade " +"durchgeführt wird. Informationen über eine maschinell auswertbare Version " +"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. " +"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und " +"<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 @@ -2900,20 +2915,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:87 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgid "" "Do not try to auto-detect the CD-ROM path. Usually combined with the " "<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" "cdrom::AutoDetect</literal>." msgstr "" -"Einhängepunkt; gibt den Ort an, an dem die CD-ROM eingehängt wird. Dieser " -"Einhängepunkt muss in <filename>/etc/fstab</filename> eingetragen und " -"angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::" -"cdrom::mount</literal>." +"versucht nicht, den CD-ROM-Pfad automatisch zu bestimmen. Dies wird " +"üblicherweise mit der Option <option>--cdrom</option> kombiniert. " +"Konfigurationselement: <literal>Acquire::cdrom::AutoDetect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:95 @@ -3894,13 +3903,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:391 -#, fuzzy -#| msgid "" -#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" -#| "literal> which accepts integer values in kilobytes. The default value is " -#| "0 which deactivates the limit and tries to use all available bandwidth " -#| "(note that this option implicitly disables downloading from multiple " -#| "servers at the same time.)" msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes per second. The default " @@ -3909,11 +3911,11 @@ msgid "" "multiple servers at the same time." msgstr "" "Die benutzte Bandbreite kann durch <literal>Acquire::http::Dl-Limit</" -"literal> eingeschränkt werden, was Ganzzahlwerte in Kilobyte akzeptiert. Der " -"Vorgabewert ist 0, was die Beschränkung ausschaltet und versucht, sämtliche " -"verfügbare Bandbreite zu benutzen. (Beachten Sie, dass diese Optionen " -"implizit das Herunterladen von mehreren Servern zur gleichen Zeit " -"deaktiviert.)" +"literal> eingeschränkt werden, was Ganzzahlwerte in Kilobyte pro Sekunde " +"akzeptiert. Der Vorgabewert ist 0, was die Beschränkung ausschaltet und " +"versucht, sämtliche verfügbare Bandbreite zu benutzen. Beachten Sie, dass " +"diese Optionen implizit das Herunterladen von mehreren Servern zur gleichen " +"Zeit deaktiviert." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:398 @@ -3940,6 +3942,15 @@ msgid "" "takes precedence over the legacy option name <literal>ProxyAutoDetect</" "literal>." msgstr "" +"<literal>Acquire::http::Proxy-Auto-Detect</literal> kann benutzt werden, um " +"einen externen Befehl zum Auffinden des HTTP-Proxys anzugeben, der benutzt " +"werden soll. APT erwartet den Befehl zum Ausgeben auf der Standardausgabe " +"imStil <literal>http://proxy:port/</literal>. Dies wird das typische " +"<literal>Acquire::http::Proxy</literal> außer Kraft setzen, aber keine " +"spezielle per <literal>Acquire::http::Proxy::$HOST</literal> gesetzte Proxy-" +"Rechnerkonfiguration. Eine Beispielimplementierung, die Avahi benutzt, " +"finden Sie im Paket &squid-deb-proxy-client;. Diese Option hat Vorrang vor " +"dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:420 @@ -4330,12 +4341,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:576 msgid "When downloading, force to use only the IPv4 protocol." -msgstr "" +msgstr "Beim Herunterladen wird die Verwendung des IPv4-Protokolls erzwungen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:582 msgid "When downloading, force to use only the IPv6 protocol." -msgstr "" +msgstr "Beim Herunterladen wird die Verwendung des IPv6-Protokolls erzwungen." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:589 @@ -4575,13 +4586,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:703 -#, fuzzy -#| msgid "" -#| "This is a list of shell commands to run before invoking &dpkg;. Like " -#| "<literal>options</literal> this must be specified in list notation. The " -#| "commands are invoked in order using <filename>/bin/sh</filename>; should " -#| "any fail APT will abort. APT will pass the filenames of all .deb files it " -#| "is going to install to the commands, one per line on standard input." msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4595,17 +4599,12 @@ msgstr "" "Listenschreibweise angegeben werden. Die Befehle werden der Reihenfolge nach " "mit <filename>/bin/sh</filename> aufgerufen, sollte einer fehlschlagen, wird " "APT abgebrochen. APT wird den Befehlen die Dateinamen aller .deb-Dateien, " -"die es installieren wird, auf der Standardeingabe übergeben, einen pro Zeile." +"die es installieren wird, einen pro Zeile, an den angeforderten " +"standardmäßig auf die Standardeingabe verweisenden Dateideskriptor, " +"übergeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:710 -#, fuzzy -#| msgid "" -#| "Version 2 of this protocol dumps more information, including the protocol " -#| "version, the APT configuration space and the packages, files and versions " -#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::" -#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command " -#| "given to <literal>Pre-Install-Pkgs</literal>." msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4614,10 +4613,8 @@ msgid "" msgstr "" "Version 2 dieses Protokolls gibt mehr Informationen aus, einschließlich der " "Protokollversion, dem APT-Konfigurationsraum und den Paketen, Dateien und " -"den Versionen, die geändert werden. Version 2 wird durch Setzen von " -"<literal>DPkg::Tools::options::cmd::Version</literal> auf 2 eingeschaltet. " -"<literal>cmd</literal> ist ein Befehl, der an <literal>Pre-Install-Pkgs</" -"literal> gegeben wird." +"den Versionen, die geändert werden. Version 3 fügt jeder ausgegebenen " +"Version die Architektur und den <literal>MultiArch</literal>-Schalter hinzu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:715 @@ -4629,6 +4626,13 @@ msgid "" "the requested version it will send the information in the highest version it " "has support for instead." msgstr "" +"Die Protokollversion, die für den Befehl <literal><replaceable>Befehl</" +"replaceable></literal> benutzt werden soll, kann durch entsprechendes Setzen " +"von <literal>DPkg::Tools::options::<replaceable>Befehl</replaceable>::" +"Version</literal> ausgewählt werden, Voreinstellung ist Version 1. Falls APT " +"die angefragte Version nicht unterstützt, wird es stattdessen die " +"Informationen in der höchsten Version senden, für die es Unterstützung " +"bietet." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:722 @@ -4640,6 +4644,13 @@ msgid "" "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which " "contains the number of the used file descriptor as a confirmation." msgstr "" +"Der Dateideskriptor, der zum Senden der Informationen benutzt wird, kann mit " +"<literal>DPkg::Tools::options::<replaceable>Befehl</replaceable>::InfoFD</" +"literal> abgefragt werden. Er ist standardmäßig <literal>0</literal> für die " +"Standardeingabe und seit Version 0.9.11 verfügbar. Unterstützung für die " +"Option können Sie finden, indem Sie in die Umgebungsvariable " +"<envar>APT_HOOK_INFO_FD</envar> schauen. Sie enthält die Nummer des " +"verwendeten Dateideskriptors als eine Bestätigung." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:732 @@ -6816,25 +6827,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml:124 -#, fuzzy -#| msgid "" -#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" -#| "replaceable>,…</literal> can be used to specify for which architectures " -#| "information should be downloaded. If this option is not set all " -#| "architectures defined by the <literal>APT::Architectures</literal> option " -#| "will be downloaded." msgid "" "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>," "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove " "architectures from the set which will be downloaded." msgstr "" -"<literal>arch=<replaceable>Architektur1</replaceable>," -"<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um " -"anzugeben, für welche Architekturen Paketinformationen heruntergeladen " -"werden sollen. Falls diese Option nicht gesetzt ist, werden alle durch die " -"Option <literal>APT::Architectures</literal> definierten Architekturen " -"heruntergeladen." +"<literal>arch+=<replaceable>Architektur1</replaceable>," +"<replaceable>Architektur2</replaceable>, …</literal> und <literal>arch-" +"=<replaceable>Architektur1</replaceable>,<replaceable>Architektur2</" +"replaceable>, …</literal>, die benutzt werden können, um der " +"Zusammenstellung, die heruntergeladen werden soll, Architekturen " +"hinzuzufügen oder zu entfernen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml:127 @@ -8685,18 +8689,9 @@ msgstr "" #. type: <p></p> #: guide.sgml:163 -#, fuzzy -#| msgid "" -#| "<prgn>apt-get</prgn> has several command line options that are detailed " -#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " -#| "option is <tt>-d</tt> which does not install the fetched files. If the " -#| "system has to download a large number of package it would be undesired to " -#| "start installing them in case something goes wrong. When <tt>-d</tt> is " -#| "used the downloaded archives can be installed by simply running the " -#| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " -- cgit v1.2.3 From 59e81cec3e2277e367f14f113168421909c42035 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 20:33:02 +0100 Subject: add "apt full-upgrade" and tweak "apt upgrade" There is a new "apt full-upgrade" that performs a apt-get dist-upgrade. "apt dist-upgrade" is still supported as a alias. The "apt upgrade" code is changed so that it mirrors the behavior of "apt-get upgrade --with-new-pkgs" and also honors "apt uprade --no-new-pkgs". --- .gitignore | 1 + apt-private/private-cmndline.cc | 5 ----- apt-private/private-upgrade.cc | 9 +++++++++ apt-private/private-upgrade.h | 1 + cmdline/apt-get.cc | 8 -------- cmdline/apt.cc | 32 +++++++++++++++++--------------- test/integration/test-apt-cli-upgrade | 34 ++++++++++++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 28 deletions(-) create mode 100755 test/integration/test-apt-cli-upgrade diff --git a/.gitignore b/.gitignore index 321b15471..69a229c3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*~ # build artifacts /aclocal.m4 /autom4te.cache/ diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index cbb40d42e..d6d7bca64 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -230,11 +230,6 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0); addArg('a', "all-versions", "APT::Cmd::All-Versions", 0); } - else if (CmdMatches("upgrade")) - { - // FIXME: find a better term - addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean); - } else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd)) { // we have no (supported) command-name overlaps so far, so we call diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc index e76b5d7fc..a97e6d25b 100644 --- a/apt-private/private-upgrade.cc +++ b/apt-private/private-upgrade.cc @@ -1,3 +1,4 @@ + // Includes /*{{{*/ #include <apt-pkg/algorithms.h> #include <apt-pkg/upgrade.h> @@ -39,6 +40,14 @@ bool DoDistUpgrade(CommandLine &CmdL) return UpgradeHelper(CmdL, 0); } /*}}}*/ +bool DoUpgrade(CommandLine &CmdL) /*{{{*/ +{ + if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true) + return DoUpgradeWithAllowNewPackages(CmdL); + else + return DoUpgradeNoNewPackages(CmdL); +} + /*}}}*/ // DoUpgradeNoNewPackages - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old diff --git a/apt-private/private-upgrade.h b/apt-private/private-upgrade.h index 050d3a668..5efc66bf7 100644 --- a/apt-private/private-upgrade.h +++ b/apt-private/private-upgrade.h @@ -5,6 +5,7 @@ bool DoDistUpgrade(CommandLine &CmdL); +bool DoUpgrade(CommandLine &CmdL); bool DoUpgradeNoNewPackages(CommandLine &CmdL); bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 8a0772ce2..da7d28a1e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1677,14 +1677,6 @@ void SigWinch(int) if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5) ScreenWidth = ws.ws_col - 1; #endif -} - /*}}}*/ -bool DoUpgrade(CommandLine &CmdL) /*{{{*/ -{ - if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true) - return DoUpgradeWithAllowNewPackages(CmdL); - else - return DoUpgradeNoNewPackages(CmdL); } /*}}}*/ int main(int argc,const char *argv[]) /*{{{*/ diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 07ade6b7c..6fe25e3f3 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -81,7 +81,8 @@ bool ShowHelp(CommandLine &CmdL) " install - install packages\n" " remove - remove packages\n" "\n" - " upgrade - upgrade the systems packages\n" + " upgrade - upgrade the system by installing/upgrading packages\n" + "full-upgrade - upgrade the system by removing/installing/upgrading packages\n" "\n" " edit-sources - edit the source information file\n" ); @@ -89,29 +90,29 @@ bool ShowHelp(CommandLine &CmdL) return true; } -// figure out what kind of upgrade the user wants -bool DoAptUpgrade(CommandLine &CmdL) -{ - if (_config->FindB("Apt::Cmd::Dist-Upgrade")) - return DoDistUpgrade(CmdL); - else - return DoUpgradeWithAllowNewPackages(CmdL); -} - int main(int argc, const char *argv[]) /*{{{*/ { - CommandLine::Dispatch Cmds[] = {{"list",&List}, + CommandLine::Dispatch Cmds[] = { + // query + {"list",&List}, {"search", &FullTextSearch}, {"show", &APT::Cmd::ShowPackage}, + // package stuff {"install",&DoInstall}, {"remove", &DoInstall}, {"purge", &DoInstall}, + // system wide stuff {"update",&DoUpdate}, - {"upgrade",&DoAptUpgrade}, + {"upgrade",&DoUpgrade}, + {"full-upgrade",&DoDistUpgrade}, + // for compat with muscle memory + {"dist-upgrade",&DoDistUpgrade}, + // misc {"edit-sources",&EditSources}, + // helper {"moo",&DoMoo}, {"help",&ShowHelp}, @@ -131,9 +132,10 @@ int main(int argc, const char *argv[]) /*{{{*/ return 100; } - // FIXME: move into a new libprivate/private-install.cc:Install() - _config->Set("DPkgPM::Progress", "1"); - _config->Set("Apt::Color", "1"); + // some different defaults + _config->CndSet("DPkgPM::Progress", "1"); + _config->CndSet("Apt::Color", "1"); + _config->CndSet("APT::Get::Upgrade-Allow-New", true); // Parse the command line and initialize the package library CommandLine CmdL(Args.data(), _config); diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade new file mode 100755 index 000000000..163a55576 --- /dev/null +++ b/test/integration/test-apt-cli-upgrade @@ -0,0 +1,34 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +insertpackage 'unstable' 'foo' 'all' '2.0' 'Depends: foo-new-dependency' +insertpackage 'unstable' 'foo-new-dependency' 'all' '2.0' +insertinstalledpackage 'foo' 'all' '1.0' + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +# default is to allow new dependencies +testequal "Calculating upgrade... Done +The following NEW packages will be installed: + foo-new-dependency +The following packages will be upgraded: + foo +1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst foo-new-dependency (2.0 unstable [all]) +Inst foo [1.0] (2.0 unstable [all]) +Conf foo-new-dependency (2.0 unstable [all]) +Conf foo (2.0 unstable [all])" apt upgrade -qq -s + +# ensure +testequal "Calculating upgrade... Done +The following packages have been kept back: + foo +0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs -- cgit v1.2.3 From 85d7c0eb60efd0de13ad331676b6227f52bed6c6 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 21:03:49 +0100 Subject: Show "Manual-Installed: {yes|no}" in apt show --- apt-private/private-show.cc | 12 ++++++++++++ test/integration/test-apt-cli-show | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 244347421..cee132843 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -37,6 +37,9 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, pkgCache *Cache = CacheFile.GetPkgCache(); if (unlikely(Cache == NULL)) return false; + pkgDepCache *depCache = CacheFile.GetDepCache(); + if (unlikely(depCache == NULL)) + return false; // Find an appropriate file pkgCache::VerFileIterator Vf = V.FileList(); @@ -73,6 +76,13 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, else package_size = _("unknown"); + pkgDepCache::StateCache &state = (*depCache)[V.ParentPkg()]; + bool is_installed = V.ParentPkg().CurrentVer() == V; + const char *manual_installed; + if (is_installed) + manual_installed = !(state.Flags & pkgCache::Flag::Auto) ? "yes" : "no"; + else + manual_installed = 0; std::string suite = GetArchiveSuite(CacheFile, V); TFRewriteData RW[] = { {"Conffiles",0}, @@ -81,8 +91,10 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, {"Installed-Size", installed_size.c_str(), 0}, {"Size", package_size.c_str(), "Download-Size"}, {"Archive-Origin", suite.c_str(), 0}, + {"Manual-Installed", manual_installed, 0}, {} }; + if(TFRewrite(stdout, Tags, NULL, RW) == false) return _error->Error("Internal Error, Unable to parse a package record"); diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index ba56e3260..11a93f268 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -10,12 +10,14 @@ configarchitecture "i386" DESCR='Some description That has multiple lines' insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR" +insertinstalledpackage 'foo' 'all' '1.0' setupaptarchive APTARCHIVE=$(readlink -f ./aptarchive) # note that we do not display Description-md5 with the "apt" cmd +# and also show some additional fields that are calculated testequal "Package: foo Priority: optional Section: other @@ -25,7 +27,8 @@ Architecture: all Version: 1.0 Filename: pool/main/foo/foo_1.0_all.deb Download-Size: unknown -Archive-Origin: unstable +Archive-Origin: unstable,now +Manual-Installed: yes Description: Some description That has multiple lines " apt show foo -- cgit v1.2.3 From 1179953a0bbf82ba22a2692586ce4f1936b2bdc9 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 21:17:07 +0100 Subject: show APT-Sources in apt show --- apt-private/private-output.h | 4 ---- apt-private/private-show.cc | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/apt-private/private-output.h b/apt-private/private-output.h index ba04ee221..2a2a69458 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -43,10 +43,6 @@ bool ShowEssential(std::ostream &out,CacheFile &Cache); void Stats(std::ostream &out, pkgDepCache &Dep); -// helpers to display single package data -std::string -GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver); - // prompting bool YnPrompt(bool Default=true); bool AnalPrompt(const char *Text); diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index cee132843..ba8b266ee 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -54,6 +54,15 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, if (I.IsOk() == false) return _error->Error(_("Package file %s is out of sync."),I.FileName()); + // find matching sources.list metaindex + pkgSourceList *SrcList = CacheFile.GetSourceList(); + pkgIndexFile *Index; + if (SrcList->FindIndex(I, Index) == false && + _system->FindIndex(I, Index) == false) + return _error->Error("Can not find indexfile for Package %s (%s)", + V.ParentPkg().Name(), V.VerStr()); + std::string source_index_file = Index->Describe(true); + // Read the record FileFd PkgF; if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false) @@ -83,15 +92,17 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, manual_installed = !(state.Flags & pkgCache::Flag::Auto) ? "yes" : "no"; else manual_installed = 0; - std::string suite = GetArchiveSuite(CacheFile, V); TFRewriteData RW[] = { + // delete {"Conffiles",0}, {"Description",0}, {"Description-md5",0}, + // improve {"Installed-Size", installed_size.c_str(), 0}, {"Size", package_size.c_str(), "Download-Size"}, - {"Archive-Origin", suite.c_str(), 0}, - {"Manual-Installed", manual_installed, 0}, + // add + {"APT-Manual-Installed", manual_installed, 0}, + {"APT-Sources", source_index_file.c_str(), 0}, {} }; -- cgit v1.2.3 From 17622532ce19a1bcebfebdfc9ec20a7e3df9dbff Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 22:20:28 +0100 Subject: hide more from apt show Hide the Hashes,Filename,Multi-Arch,Architecture by default from "apt show". The information is still available via apt-cache show. Also improve the output of the Size- --- apt-private/private-show.cc | 15 ++++++++++++--- test/integration/test-apt-cli-show | 8 +++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index ba8b266ee..60d951316 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -76,12 +76,12 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, // make size nice std::string installed_size; if (Tags.FindI("Installed-Size") > 0) - installed_size = SizeToStr(Tags.FindI("Installed-Size")*1024); + strprintf(installed_size, "%sB", SizeToStr(Tags.FindI("Installed-Size")*1024).c_str()); else installed_size = _("unknown"); std::string package_size; if (Tags.FindI("Size") > 0) - package_size = SizeToStr(Tags.FindI("Size")); + strprintf(package_size, "%sB", SizeToStr(Tags.FindI("Size")).c_str()); else package_size = _("unknown"); @@ -92,9 +92,18 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, manual_installed = !(state.Flags & pkgCache::Flag::Auto) ? "yes" : "no"; else manual_installed = 0; + + // FIXME: add verbose that does not do the removal of the tags? TFRewriteData RW[] = { - // delete + // delete, apt-cache show has this info and most users do not care + {"MD5sum", 0}, + {"SHA1", 0}, + {"SHA256", 0}, + {"Filename", 0}, + {"Multi-Arch", 0}, + {"Architecture", 0}, {"Conffiles",0}, + // we use the translated description {"Description",0}, {"Description-md5",0}, // improve diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index 11a93f268..91cc9a3c0 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -21,14 +21,12 @@ APTARCHIVE=$(readlink -f ./aptarchive) testequal "Package: foo Priority: optional Section: other -Installed-Size: 43.0 k +Installed-Size: 43.0 kB Maintainer: Joe Sixpack <joe@example.org> -Architecture: all Version: 1.0 -Filename: pool/main/foo/foo_1.0_all.deb Download-Size: unknown -Archive-Origin: unstable,now -Manual-Installed: yes +APT-Manual-Installed: yes +APT-Sources: file:$APTARCHIVE/ unstable/main i386 Packages Description: Some description That has multiple lines " apt show foo -- cgit v1.2.3 From 1aef66d5e150c608276fabdf1c2d2aaca9c45b7f Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 22:59:36 +0100 Subject: apt-mark help shows all commands now --- cmdline/apt-mark.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index ebb1f9892..d3a3a780b 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -386,6 +386,11 @@ bool ShowHelp(CommandLine &CmdL) "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" + " hold - Mark a package as held back\n" + " unhold - Unset a package set as held back\n" + " showauto - Print the list of automatically installed packages\n" + " showmanual - Print the list of manually installed packages\n" + " showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" -- cgit v1.2.3 From dcde2d749e01a3aa6b20222c689ee39de71e369a Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 23:16:27 +0100 Subject: make update-po --- doc/po/apt-doc.pot | 6 ++--- doc/po/de.po | 68 +++++++++++++++++++++++++++--------------------------- doc/po/es.po | 30 ++++++++++++------------ doc/po/fr.po | 34 +++++++++++++-------------- doc/po/it.po | 20 ++++++++-------- doc/po/ja.po | 30 ++++++++++++------------ doc/po/pl.po | 20 ++++++++-------- doc/po/pt.po | 43 +++++++++++++++++----------------- doc/po/pt_BR.po | 20 ++++++++-------- po/ar.po | 40 +++++++++++++++++++++++--------- po/ast.po | 44 ++++++++++++++++++++++++----------- po/bg.po | 41 +++++++++++++++++++++++--------- po/bs.po | 40 +++++++++++++++++++++++--------- po/ca.po | 40 +++++++++++++++++++++++--------- po/cs.po | 42 ++++++++++++++++++++++++--------- po/cy.po | 40 +++++++++++++++++++++++--------- po/da.po | 41 +++++++++++++++++++++++--------- po/de.po | 45 +++++++++++++++++++++++++----------- po/dz.po | 44 ++++++++++++++++++++++++----------- po/el.po | 44 ++++++++++++++++++++++++----------- po/es.po | 48 ++++++++++++++++++++++++++------------ po/eu.po | 40 +++++++++++++++++++++++--------- po/fi.po | 40 +++++++++++++++++++++++--------- po/fr.po | 41 +++++++++++++++++++++++--------- po/gl.po | 40 +++++++++++++++++++++++--------- po/hu.po | 41 +++++++++++++++++++++++--------- po/it.po | 45 +++++++++++++++++++++++++----------- po/ja.po | 44 ++++++++++++++++++++++++----------- po/km.po | 40 +++++++++++++++++++++++--------- po/ko.po | 39 ++++++++++++++++++++++--------- po/ku.po | 40 +++++++++++++++++++++++--------- po/lt.po | 40 +++++++++++++++++++++++--------- po/mr.po | 40 +++++++++++++++++++++++--------- po/nb.po | 40 +++++++++++++++++++++++--------- po/ne.po | 40 +++++++++++++++++++++++--------- po/nl.po | 40 +++++++++++++++++++++++--------- po/nn.po | 40 +++++++++++++++++++++++--------- po/pl.po | 42 ++++++++++++++++++++++++--------- po/pt.po | 45 +++++++++++++++++++++++++----------- po/pt_BR.po | 40 +++++++++++++++++++++++--------- po/ro.po | 45 +++++++++++++++++++++++++----------- po/ru.po | 42 ++++++++++++++++++++++++--------- po/sk.po | 42 ++++++++++++++++++++++++--------- po/sl.po | 47 ++++++++++++++++++++++++++----------- po/sv.po | 40 +++++++++++++++++++++++--------- po/th.po | 40 +++++++++++++++++++++++--------- po/tl.po | 40 +++++++++++++++++++++++--------- po/tr.po | 41 +++++++++++++++++++++++--------- po/uk.po | 42 ++++++++++++++++++++++++--------- po/vi.po | 40 +++++++++++++++++++++++--------- po/zh_CN.po | 39 ++++++++++++++++++++++--------- po/zh_TW.po | 40 +++++++++++++++++++++++--------- 52 files changed, 1424 insertions(+), 631 deletions(-) diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index cf1661294..5d74d583d 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.14.3~exp3\n" +"Project-Id-Version: apt-doc 0.9.14.3~exp4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -6186,7 +6186,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/de.po b/doc/po/de.po index efcbfdda1..c00dd2b67 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+0100\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -763,9 +763,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -3825,12 +3825,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er " -"wird standardmäßig in der Form <literal>http://[[Anwender][:" -"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann " -"außerdem in der Form <literal>http::Proxy::<host></literal> mit dem " -"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass " -"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben " -"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt." +"wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]" +"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in " +"der Form <literal>http::Proxy::<host></literal> mit dem speziellen " +"Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies " +"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird " +"die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:368 @@ -5126,15 +5126,15 @@ msgstr "" "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" "literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> " -"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> " -"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version " -"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur " -"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version " -"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer " -"niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, " -"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die " -"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in " -"dem das Paket erscheint." +"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> (Abschnitt)" +"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes " +"ist, <literal>d.e.f</literal> die Version ist, die zur Installation " +"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die " +"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-" +"Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt " +"oder wenn sie die gleiche Version haben, wie die, die installiert ist. " +"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket " +"erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:1094 @@ -6379,9 +6379,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " -"neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder " -"type=\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" +"(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:586 @@ -6462,9 +6462,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " -"neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder " -"type=\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" +"(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:635 @@ -6567,8 +6567,8 @@ msgid "" "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " -"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" +"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@ -8347,9 +8347,9 @@ msgstr "BESCHREIBUNG" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche " "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die " @@ -8760,7 +8760,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " @@ -8943,9 +8943,9 @@ msgstr "" "Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die " "Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " "auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das " -"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. " -"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get " -"update</tt> ausgeführt wurde." +"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]" +"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</" +"tt> ausgeführt wurde." #. type: <p></p> #: guide.sgml:253 diff --git a/doc/po/es.po b/doc/po/es.po index c85b67e51..e7397fb80 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-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -848,9 +848,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -6817,10 +6817,10 @@ msgid "" "<literal>APT</literal> will automatically generate a URI with the current " "architecture otherwise." msgstr "" -"<literal>distribución</literal> puede contener una variable, <literal>" -"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el " -"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). " -"Esto permite que los ficheros <filename>sources.list</filename> sean " +"<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)" +"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema " +"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto " +"permite que los ficheros <filename>sources.list</filename> sean " "independientes de la arquitectura. En general, esta característica sólo es " "de interés si se especifica una ruta completa, de lo contrario <literal>APT</" "literal> generará automáticamente una URI con la arquitectura actual del " @@ -8359,9 +8359,9 @@ msgstr "DESCRIPCIÓN" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT es un sistema de gestión de paquetes de software. Dispone de varias " "interfaces para la gestión de paquetes normal del día a día, tales como " @@ -8762,7 +8762,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " @@ -8940,9 +8940,9 @@ msgid "" "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." msgstr "" -"Es necesario actualizar la lista disponible mediante el elemento de menú " -"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto " -"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " +"Es necesario actualizar la lista disponible mediante el elemento de menú [A]" +"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de " +"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " "información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado " "<tt>apt-get update</tt> con anterioridad." diff --git a/doc/po/fr.po b/doc/po/fr.po index b47d1ea50..c9ba2fb59 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-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -760,9 +760,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -824,10 +824,10 @@ msgstr "" "déjà installés sans mettre à jour les autres paquets du système. À la " "différence de la commande « upgrade » qui installera la dernière version " "disponible de tous les paquets installés au moment de son exécution, " -"« install » n'installera la nouvelle version que pour le(s) paquet(s) " -"indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et " -"si une nouvelle version est disponible, cette version (et ses dépendances, " -"comme décrit plus haut) sera récupérée et installée." +"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué" +"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une " +"nouvelle version est disponible, cette version (et ses dépendances, comme " +"décrit plus haut) sera récupérée et installée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:139 @@ -8300,9 +8300,9 @@ msgstr "DESCRIPTION" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT est un système de gestion de paquets logiciels. Pour la gestion au " "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en " @@ -8723,7 +8723,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " @@ -8925,11 +8925,11 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" -"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option " -"« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » " -"pour les installer. Lorsque la méthode APT est utilisée, les options " -"« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » " -"fait l'ensemble des opérations." +"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]" +"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour " +"les installer. Lorsque la méthode APT est utilisée, les options « [C]" +"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait " +"l'ensemble des opérations." #. type: <p></p> #: guide.sgml:258 diff --git a/doc/po/it.po b/doc/po/it.po index 59385473d..11f3dba52 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-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -812,9 +812,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -8328,9 +8328,9 @@ msgstr "DESCRIZIONE" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT è un sistema di gestione per i pacchetti software. Per la normale " "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali " @@ -8384,8 +8384,8 @@ msgid "" "B<reportbug>(1) command." msgstr "" "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, " -"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando " -"B<reportbug>(1)." +"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>" +"(1)." #. type: SH #: apt.8:51 @@ -8736,7 +8736,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index c77ab011a..aea2efb4a 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-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -800,9 +800,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -3878,10 +3878,10 @@ msgstr "" "るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す" "る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ" "ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ" -"い。URI を構成するコンポーネントに対応する置換変数は、<literal>" -"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" -"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" -"literal>, <literal>$(SITE_PORT)</literal> です。" +"い。URI を構成するコンポーネントに対応する置換変数は、<literal>$(PROXY_USER)" +"</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</" +"literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, " +"<literal>$(SITE_PORT)</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:469 @@ -7991,14 +7991,14 @@ msgstr "説明" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため" -"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の " -"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか" -"のオプションは B<apt-get>(8) にしか実装されていません。" +"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>" +"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ" +"ンは B<apt-get>(8) にしか実装されていません。" #. type: SH #: apt.8:31 @@ -8306,7 +8306,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index a9b6a2ed1..2e27ba210 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-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -811,9 +811,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -7556,9 +7556,9 @@ msgstr "OPIS" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek " "przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), " @@ -7844,8 +7844,8 @@ msgstr "" "Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw " "ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</" "p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest " -"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources." -"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " +"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list" +"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " "pomocą polecenia <tt>apt-get update</tt>. Na przykład:" #. type: <example></example> @@ -7966,7 +7966,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index f51bc327a..f555d41a8 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-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -809,9 +809,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -3813,12 +3813,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> define o proxy http predefinido a usar para " -"URIs de HTTP. Está no formato standard de <literal>http://[[user][:" -"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por " -"máquina ao usar o formato <literal>http::Proxy::<host></literal> com a " -"palavra chave especial <literal>DIRECT</literal> que significa não usar " -"proxies. Se nenhuma das definições acima for especificada, será usada a " -"variável de ambiente <envar>http_proxy</envar>." +"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]" +"host[:port]/</literal>. Também podem ser especificados proxies por máquina " +"ao usar o formato <literal>http::Proxy::<host></literal> com a palavra " +"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se " +"nenhuma das definições acima for especificada, será usada a variável de " +"ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:368 @@ -4012,9 +4012,8 @@ msgstr "" "servidor proxy ao que se ligar. Por favor veja &configureindex; para um " "exemplo de como fazer isto. As variáveis de substituição que representam o " "componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>" -"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>" -"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</" -"literal>." +"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)" +"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:469 @@ -8266,9 +8265,9 @@ msgstr "DESCRIÇÃO" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" "APT é um sistema de gestão para pacotes de software. Para a gestão de " "pacotes normal do dia-a-dia existem vários frontends disponíveis, como o " @@ -8547,11 +8546,11 @@ msgid "" "instance," msgstr "" "O primeira <footnote><p>se você está a usar um servidor proxy http você tem " -"que definir a variável de ambiente http_proxy primeiro, veja sources." -"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</" -"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que " -"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get " -"update</tt>. Por exemplo," +"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)" +"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> " +"é obter as listas de pacotes a partir das <em>Sources</em> para que ele " +"saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</" +"tt>. Por exemplo," #. type: <example></example> #: guide.sgml:116 @@ -8670,7 +8669,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index c49ebb181..773473ceb 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-01-22 19:01+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -586,9 +586,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the " -"package(s) specified for installation will also be retrieved and installed. " -"The <filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the package" +"(s) specified for installation will also be retrieved and installed. The " +"<filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -4903,8 +4903,8 @@ msgid "" "id=\"0\"/>" msgstr "" "Com um arquivo &sources-list; adequado e o arquivo de preferências do APT " -"acima, quaisquer dos comandos a seguir farão com que o APT atualize para " -"a(s) última(s) versão(ões) <literal>testing</literal>." +"acima, quaisquer dos comandos a seguir farão com que o APT atualize para a" +"(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:635 @@ -6291,9 +6291,9 @@ msgstr "" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as " -"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " -"System. Some options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." msgstr "" #. type: SH @@ -6601,7 +6601,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/po/ar.po b/po/ar.po index c2e5b5898..ecce809fc 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -96,7 +96,7 @@ msgid "Total space accounted for: " msgstr "مجموع المساحة المحسوب حسابها:" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "" @@ -104,7 +104,7 @@ msgstr "" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "لم يُعثر على أية حزم" @@ -575,6 +575,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -602,7 +607,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -638,11 +644,11 @@ msgid "File not found" msgstr "لم يُعثر على الملف" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -731,7 +737,7 @@ msgstr "" msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "فشل" @@ -1400,16 +1406,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "تمّ" @@ -1417,7 +1423,19 @@ msgstr "تمّ" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/ast.po b/po/ast.po index 8535b4737..80698e3b9 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -89,7 +89,7 @@ msgid "Total space accounted for: " msgstr "Informe del total d'espaciu: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "El ficheru de paquetes %s nun ta sincronizáu." @@ -97,7 +97,7 @@ msgstr "El ficheru de paquetes %s nun ta sincronizáu." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Nun s'alcontraron paquetes" @@ -620,8 +620,8 @@ msgstr "" " -c=? Lleer esti ficheru de configuración\n" " -o=? Afitar una opción de configuración arbitraria, p. ex. -o dir::cache=/" "tmp\n" -"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt." -"conf(5)\n" +"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt.conf" +"(5)\n" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" @@ -681,6 +681,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -708,7 +713,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -744,11 +750,11 @@ msgid "File not found" msgstr "Nun s'atopa'l ficheru." #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -837,7 +843,7 @@ msgstr "Nun se pudo crear un socket" msgid "Could not connect data socket, connection timed out" msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falló" @@ -1522,16 +1528,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Calculando l'anovamientu... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Error internu, AllUpgrade rompió coses" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Fecho" @@ -1539,7 +1545,19 @@ msgstr "Fecho" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/bg.po b/po/bg.po index b2891596b..6d4986e4a 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -95,7 +95,7 @@ msgid "Total space accounted for: " msgstr "Общо отчетено пространство: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Пакетният файл %s не е синхронизиран." @@ -103,7 +103,7 @@ msgstr "Пакетният файл %s не е синхронизиран." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Няма намерени пакети" @@ -679,6 +679,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -688,6 +689,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -734,7 +740,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -770,11 +777,11 @@ msgid "File not found" msgstr "Файлът не е намерен" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -865,7 +872,7 @@ msgstr "" "Неуспех при свързването на гнездо за данни, допустимото време за свързване " "изтече" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Неуспех" @@ -1557,16 +1564,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Готово" @@ -1574,7 +1581,19 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/bs.po b/po/bs.po index 842e8d9aa..17a19521c 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -92,7 +92,7 @@ msgid "Total space accounted for: " msgstr "" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "" @@ -100,7 +100,7 @@ msgstr "" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Paketi nisu pronađeni" @@ -581,6 +581,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -608,7 +613,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -644,11 +650,11 @@ msgid "File not found" msgstr "Datoteka nije pronađena" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "" @@ -736,7 +742,7 @@ msgstr "" msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Neuspješno" @@ -1399,15 +1405,15 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 msgid "Internal error, Upgrade broke stuff" msgstr "" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Urađeno" @@ -1415,7 +1421,19 @@ msgstr "Urađeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/ca.po b/po/ca.po index 50754b3b3..dcd89b358 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -92,7 +92,7 @@ msgid "Total space accounted for: " msgstr "Nombre total de l'espai atribuït a: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." @@ -100,7 +100,7 @@ msgstr "El fitxer %s del paquet està desincronitzat." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "No s'han trobat paquets" @@ -692,6 +692,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -719,7 +724,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -755,11 +761,11 @@ msgid "File not found" msgstr "Fitxer no trobat" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -848,7 +854,7 @@ msgstr "No s'ha pogut crear un sòcol" msgid "Could not connect data socket, connection timed out" msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Ha fallat" @@ -1545,16 +1551,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització… " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Fet" @@ -1562,7 +1568,19 @@ msgstr "Fet" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/cs.po b/po/cs.po index fc9092ec1..6e6d444c9 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -91,7 +91,7 @@ msgid "Total space accounted for: " msgstr "Celkem přiřazeného místa: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je špatně synchronizovaný." @@ -99,7 +99,7 @@ msgstr "Soubor balíku %s je špatně synchronizovaný." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" @@ -662,6 +662,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Spuštění dpkg selhalo. Jste root?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -671,6 +672,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -716,7 +722,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -752,11 +759,11 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -845,7 +852,7 @@ msgstr "Nelze vytvořit socket" msgid "Could not connect data socket, connection timed out" msgstr "Nelze připojit datový socket, čas spojení vypršel" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Selhalo" @@ -1533,16 +1540,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci… " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Hotovo" @@ -1550,7 +1557,20 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/cy.po b/po/cy.po index ffb6a9200..5e4269a2a 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -105,7 +105,7 @@ msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." @@ -113,7 +113,7 @@ msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Canfuwyd dim pecyn" @@ -695,6 +695,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -722,7 +727,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -762,11 +768,11 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -856,7 +862,7 @@ msgstr "Methwyd creu soced" msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Methwyd" @@ -1552,17 +1558,17 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Wedi Gorffen" @@ -1570,7 +1576,19 @@ msgstr "Wedi Gorffen" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/da.po b/po/da.po index c83217d52..414505102 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Total plads, der kan gøres rede for: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefilen %s er ude af trit." @@ -102,7 +102,7 @@ msgstr "Pakkefilen %s er ude af trit." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Fandt ingen pakker" @@ -674,6 +674,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -683,6 +684,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -731,7 +737,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -780,11 +787,11 @@ msgid "File not found" msgstr "Fil blev ikke fundet" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -873,7 +880,7 @@ msgstr "Kunne ikke oprette sokkel" msgid "Could not connect data socket, connection timed out" msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislykkedes" @@ -1560,15 +1567,15 @@ msgstr "Sortering" msgid "The update command takes no arguments" msgstr "»update«-kommandoen benytter ingen parametre" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen ... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 msgid "Internal error, Upgrade broke stuff" msgstr "Intern fejl, opgradering blev afbrudt" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Færdig" @@ -1576,7 +1583,19 @@ msgstr "Færdig" msgid "Full Text Search" msgstr "Fuldtekst-søgning" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "ikke en reel pakke (virtuel)" diff --git a/po/de.po b/po/de.po index 55d969669..b7f145da3 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Gesamtmenge an Speicher: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." @@ -102,7 +102,7 @@ msgstr "Paketdatei %s ist nicht synchronisiert." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Keine Pakete gefunden" @@ -695,6 +695,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -704,6 +705,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -751,7 +757,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -790,11 +797,11 @@ msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -883,7 +890,7 @@ msgstr "Socket konnte nicht erzeugt werden." msgid "Could not connect data socket, connection timed out" msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden." -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Fehlgeschlagen" @@ -1589,16 +1596,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente." -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt." -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Fertig" @@ -1606,7 +1613,19 @@ msgstr "Fertig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" @@ -1753,8 +1772,8 @@ msgstr "fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und " -"[I]nstallieren Sie erneut." +"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und [I]" +"nstallieren Sie erneut." #: dselect/update:30 msgid "Merging available information" diff --git a/po/dz.po b/po/dz.po index 2fa0dbfe4..a504b7d0c 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -96,7 +96,7 @@ msgid "Total space accounted for: " msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།" @@ -104,7 +104,7 @@ msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་ #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།" @@ -612,8 +612,8 @@ msgstr "" " -V བརྡ་དོན་ལེ་ཤཱ་གི་འཐོན་རིམ་ཨང་གྲངས་ཚུ་སྟོན།\n" " -c=? འ་ནི་རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ལྷག\n" " -o=? མཐུན་སྒྲིག་གདམ་ཁ་གི་རིམ་སྒྲིག་ཅིག་གཞི་བཙུགས་འབད་ དཔེན་ན་-o dir::cache=/tmp\n" -"བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་ sources.list(5) དང་apt." -"conf(5)ལག་ཐོག་\n" +"བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་ sources.list(5) དང་apt.conf(5)" +"ལག་ཐོག་\n" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" @@ -673,6 +673,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -700,7 +705,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -737,11 +743,11 @@ msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -830,7 +836,7 @@ msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འ msgid "Could not connect data socket, connection timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1514,16 +1520,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "འབད་ཚར་ཡི།" @@ -1531,7 +1537,19 @@ msgstr "འབད་ཚར་ཡི།" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/el.po b/po/el.po index 49fc970fa..d42b7c617 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -102,7 +102,7 @@ msgid "Total space accounted for: " msgstr "Συνολικός Καταμετρημένος Χώρος: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." @@ -110,7 +110,7 @@ msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμέ #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" @@ -685,6 +685,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -712,7 +717,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -748,11 +754,11 @@ msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -841,7 +847,7 @@ msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket msgid "Could not connect data socket, connection timed out" msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Απέτυχε" @@ -1534,16 +1540,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Ετοιμο" @@ -1551,7 +1557,19 @@ msgstr "Ετοιμο" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" @@ -1694,8 +1712,8 @@ msgstr "" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε " -"[I]nstall ξανά" +"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε [I]" +"nstall ξανά" #: dselect/update:30 msgid "Merging available information" diff --git a/po/es.po b/po/es.po index d00d39a40..5f91486f0 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -147,7 +147,7 @@ msgid "Total space accounted for: " msgstr "Espacio registrado total: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "El archivo de paquetes %s está desincronizado." @@ -155,7 +155,7 @@ msgstr "El archivo de paquetes %s está desincronizado." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "No se encontró ningún paquete" @@ -684,8 +684,8 @@ msgstr "" " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria, p. ej. \n" " -o dir::cache=/tmp\n" -"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt." -"conf(5)\n" +"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt.conf" +"(5)\n" "para más información y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" @@ -745,6 +745,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -772,7 +777,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -808,11 +814,11 @@ msgid "File not found" msgstr "Fichero no encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -901,7 +907,7 @@ msgstr "No pude crear un socket" msgid "Could not connect data socket, connection timed out" msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falló" @@ -1596,16 +1602,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Listo" @@ -1613,7 +1619,19 @@ msgstr "Listo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" @@ -1760,8 +1778,8 @@ msgstr "" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"encima de este mensaje son importantes. Por favor, corríjalas y ejecute " -"«[I]nstall» otra vez" +"encima de este mensaje son importantes. Por favor, corríjalas y ejecute «[I]" +"nstall» otra vez" #: dselect/update:30 msgid "Merging available information" diff --git a/po/eu.po b/po/eu.po index 98fd03418..9b8cf427b 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -93,7 +93,7 @@ msgid "Total space accounted for: " msgstr "Guztira erregistratutako lekua: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "%s pakete fitxategia ez dago sinkronizatuta." @@ -101,7 +101,7 @@ msgstr "%s pakete fitxategia ez dago sinkronizatuta." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Ez da paketerik aurkitu" @@ -672,6 +672,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -699,7 +704,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -736,11 +742,11 @@ msgid "File not found" msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -832,7 +838,7 @@ msgid "Could not connect data socket, connection timed out" msgstr "" "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Huts egin du" @@ -1522,16 +1528,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Eginda" @@ -1539,7 +1545,19 @@ msgstr "Eginda" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/fi.po b/po/fi.po index e88e95087..a369c6ce0 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -93,7 +93,7 @@ msgid "Total space accounted for: " msgstr "Käytetty tila yhteensä: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Pakettitiedosto %s ei ole ajan tasalla." @@ -101,7 +101,7 @@ msgstr "Pakettitiedosto %s ei ole ajan tasalla." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" @@ -667,6 +667,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -694,7 +699,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -730,11 +736,11 @@ msgid "File not found" msgstr "Tiedostoa ei löydy" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -823,7 +829,7 @@ msgstr "Pistoketta ei voitu luoda" msgid "Could not connect data socket, connection timed out" msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Ei onnistunut" @@ -1514,16 +1520,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Valmis" @@ -1531,7 +1537,19 @@ msgstr "Valmis" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/fr.po b/po/fr.po index efd774afc..ce6ec1a53 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -93,7 +93,7 @@ msgid "Total space accounted for: " msgstr "Total de l'espace attribué : " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Fichier %s désynchronisé." @@ -101,7 +101,7 @@ msgstr "Fichier %s désynchronisé." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Aucun paquet n'a été trouvé" @@ -697,6 +697,7 @@ msgstr "" "superutilisateur ?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -706,6 +707,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -755,7 +761,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -793,11 +800,11 @@ msgid "File not found" msgstr "Fichier non trouvé" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -888,7 +895,7 @@ msgid "Could not connect data socket, connection timed out" msgstr "" "Impossible de se connecter sur le port de données, délai de connexion dépassé" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Échec" @@ -1597,16 +1604,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas de paramètre" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Fait" @@ -1614,7 +1621,19 @@ msgstr "Fait" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/gl.po b/po/gl.po index 47dcd9197..f0b6c98d5 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -96,7 +96,7 @@ msgid "Total space accounted for: " msgstr "Espazo total contabilizado: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro de paquete %s está sen sincronizar." @@ -104,7 +104,7 @@ msgstr "O ficheiro de paquete %s está sen sincronizar." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Non se atopou ningún paquete" @@ -690,6 +690,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -717,7 +722,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -753,11 +759,11 @@ msgid "File not found" msgstr "Non se atopou o ficheiro" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -847,7 +853,7 @@ msgid "Could not connect data socket, connection timed out" msgstr "" "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Fallou" @@ -1546,16 +1552,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "A orde «update» non toma argumentos" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Calculando a anovación... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Produciuse un erro interno, AllUpgrade estragou cousas" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Feito" @@ -1563,7 +1569,19 @@ msgstr "Feito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/hu.po b/po/hu.po index 431128f89..e035f5b94 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -95,7 +95,7 @@ msgid "Total space accounted for: " msgstr "Nyilvántartott terület összesen: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "%s csomagfájl nincs szinkronban." @@ -103,7 +103,7 @@ msgstr "%s csomagfájl nincs szinkronban." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Nem találhatók csomagok" @@ -676,6 +676,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -685,6 +686,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -732,7 +738,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -769,11 +776,11 @@ msgid "File not found" msgstr "A fájl nem található" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -865,7 +872,7 @@ msgid "Could not connect data socket, connection timed out" msgstr "" "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Sikertelen" @@ -1551,16 +1558,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Belső hiba, az AllUpgrade megsértett valamit" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Kész" @@ -1568,7 +1575,19 @@ msgstr "Kész" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/it.po b/po/it.po index ba95d59e8..4944388d1 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Totale spazio occupato: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Il file dei pacchetti %s non è sincronizzato." @@ -102,7 +102,7 @@ msgstr "Il file dei pacchetti %s non è sincronizzato." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Nessun pacchetto trovato" @@ -473,8 +473,8 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -"Informazioni sull'architettura non disponibili per %s. Consultare apt." -"conf(5) APT::Architectures per l'impostazione" +"Informazioni sull'architettura non disponibili per %s. Consultare apt.conf" +"(5) APT::Architectures per l'impostazione" #: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 #, c-format @@ -689,6 +689,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -698,6 +699,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -746,7 +752,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -782,11 +789,11 @@ msgid "File not found" msgstr "File non trovato" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -877,7 +884,7 @@ msgid "Could not connect data socket, connection timed out" msgstr "" "Impossibile connettersi al socket dati, tempo esaurito per la connessione" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Non riuscito" @@ -1580,16 +1587,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Eseguito" @@ -1597,7 +1604,19 @@ msgstr "Eseguito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/ja.po b/po/ja.po index d15236eed..83a3de3d9 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -92,7 +92,7 @@ msgid "Total space accounted for: " msgstr "総占有容量: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Package ファイル %s が同期していません。" @@ -100,7 +100,7 @@ msgstr "Package ファイル %s が同期していません。" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "パッケージが見つかりません" @@ -463,8 +463,8 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." -"conf(5) の APT::Architectures を参照してください。" +"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf" +"(5) の APT::Architectures を参照してください。" #: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 #, c-format @@ -681,6 +681,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -690,6 +691,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -736,7 +742,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -772,11 +779,11 @@ msgid "File not found" msgstr "ファイルが見つかりません" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -865,7 +872,7 @@ msgstr "ソケットを作成できません" msgid "Could not connect data socket, connection timed out" msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失敗" @@ -1550,16 +1557,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "完了" @@ -1567,7 +1574,18 @@ msgstr "完了" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/km.po b/po/km.po index 83159baab..bfde70dc1 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -97,7 +97,7 @@ msgid "Total space accounted for: " msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។" @@ -105,7 +105,7 @@ msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "រក​កញ្ចប់​មិន​ឃើញ" @@ -665,6 +665,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -692,7 +697,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -728,11 +734,11 @@ msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -820,7 +826,7 @@ msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើ msgid "Could not connect data socket, connection timed out" msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "បាន​បរាជ័យ" @@ -1496,16 +1502,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "ធ្វើរួច​" @@ -1513,7 +1519,19 @@ msgstr "ធ្វើរួច​" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/ko.po b/po/ko.po index 9c4139434..84371c06c 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -89,7 +89,7 @@ msgid "Total space accounted for: " msgstr "차지하는 전체 용량: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다." @@ -97,7 +97,7 @@ msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "패키지가 없습니다" @@ -672,6 +672,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -699,7 +704,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -735,11 +741,11 @@ msgid "File not found" msgstr "파일이 없습니다" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -828,7 +834,7 @@ msgstr "소켓을 만들 수 없습니다" msgid "Could not connect data socket, connection timed out" msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "실패" @@ -1508,16 +1514,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "완료" @@ -1525,7 +1531,18 @@ msgstr "완료" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/ku.po b/po/ku.po index 3176a8446..b0c480c53 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -96,7 +96,7 @@ msgid "Total space accounted for: " msgstr "Cihê giştî yê veqetandî: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Pakêta dosya %s li derveyî demê ye." @@ -104,7 +104,7 @@ msgstr "Pakêta dosya %s li derveyî demê ye." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Pakêt nayên dîtin" @@ -587,6 +587,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -614,7 +619,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -648,12 +654,12 @@ msgid "File not found" msgstr "Pel nehate dîtin" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "" @@ -740,7 +746,7 @@ msgstr "" msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Serneket" @@ -1404,15 +1410,15 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 msgid "Internal error, Upgrade broke stuff" msgstr "" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Temam" @@ -1420,7 +1426,19 @@ msgstr "Temam" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/lt.po b/po/lt.po index 8aa36e261..bc31fa4df 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -95,7 +95,7 @@ msgid "Total space accounted for: " msgstr "" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "" @@ -103,7 +103,7 @@ msgstr "" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Paketų nerasta" @@ -591,6 +591,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -618,7 +623,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -652,11 +658,11 @@ msgid "File not found" msgstr "Failas nerastas" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "" @@ -743,7 +749,7 @@ msgstr "" msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Nepavyko" @@ -1418,16 +1424,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Įvykdyta" @@ -1435,7 +1441,19 @@ msgstr "Įvykdyta" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/mr.po b/po/mr.po index 4b837e847..2fbd3e13c 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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 " @@ -91,7 +91,7 @@ msgid "Total space accounted for: " msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत" @@ -99,7 +99,7 @@ msgstr "पॅकेज संचिका %s सिंक्रोनाइज #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "पॅकेजेस सापडले नाहीत" @@ -661,6 +661,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -688,7 +693,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -724,11 +730,11 @@ msgid "File not found" msgstr "फाईल सापडली नाही" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -817,7 +823,7 @@ msgstr "सॉकेट तयार करू शकत नाही" msgid "Could not connect data socket, connection timed out" msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "असमर्थ" @@ -1500,16 +1506,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "झाले" @@ -1517,7 +1523,19 @@ msgstr "झाले" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/nb.po b/po/nb.po index abf8d5cfd..285537d3f 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -96,7 +96,7 @@ msgid "Total space accounted for: " msgstr "Samlet mengde redegjort plass: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ikke oppdatert." @@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ikke oppdatert." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Fant ingen pakker" @@ -676,6 +676,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -703,7 +708,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -741,11 +747,11 @@ msgid "File not found" msgstr "Fant ikke fila" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -834,7 +840,7 @@ msgstr "Klarte ikke å opprette en sokkel" msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislyktes" @@ -1521,16 +1527,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Utført" @@ -1538,7 +1544,19 @@ msgstr "Utført" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/ne.po b/po/ne.po index 8903feb0f..8238870e5 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "को लागि कूल खाली ठाऊँ लेखांकन:" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।" @@ -102,7 +102,7 @@ msgstr "प्याकेज फाइल %s sync भन्दा बाहि #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "कुनै प्याकेजहरू फेला परेन" @@ -663,6 +663,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -690,7 +695,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -726,11 +732,11 @@ msgid "File not found" msgstr "फाइल फेला परेन " #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -819,7 +825,7 @@ msgstr "एउटा सकेट सिर्जना गर्न सके msgid "Could not connect data socket, connection timed out" msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "असफल भयो" @@ -1497,16 +1503,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "काम भयो" @@ -1514,7 +1520,19 @@ msgstr "काम भयो" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/nl.po b/po/nl.po index 89896ce90..5ecfd3b26 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -95,7 +95,7 @@ msgid "Total space accounted for: " msgstr "Totale hoeveelheid verantwoorde ruimte: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Pakketbestand %s is niet meer gesynchroniseerd." @@ -103,7 +103,7 @@ msgstr "Pakketbestand %s is niet meer gesynchroniseerd." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Geen pakketten gevonden" @@ -688,6 +688,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -715,7 +720,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -752,11 +758,11 @@ msgid "File not found" msgstr "Bestand niet gevonden" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -845,7 +851,7 @@ msgstr "Kon geen socket aanmaken" msgid "Could not connect data socket, connection timed out" msgstr "Kon de datasocket niet verbinden, de verbinding verliep" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislukt" @@ -1541,16 +1547,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "De opdracht 'update' aanvaard geen argumenten" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Klaar" @@ -1558,7 +1564,19 @@ msgstr "Klaar" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/nn.po b/po/nn.po index 6a8b433df..5ccf56d13 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -96,7 +96,7 @@ msgid "Total space accounted for: " msgstr "Brukt plass i alt: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ute av takt." @@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ute av takt." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Fann ingen pakkar" @@ -670,6 +670,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -697,7 +702,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -735,11 +741,11 @@ msgid "File not found" msgstr "Fann ikkje fila" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -828,7 +834,7 @@ msgstr "Klarte ikkje oppretta sokkel" msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislukkast" @@ -1508,16 +1514,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Ferdig" @@ -1525,7 +1531,19 @@ msgstr "Ferdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/pl.po b/po/pl.po index ded03b008..eda56e551 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -97,7 +97,7 @@ msgid "Total space accounted for: " msgstr "Całkowity rozmiar: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Plik pakietu %s jest przestarzały." @@ -105,7 +105,7 @@ msgstr "Plik pakietu %s jest przestarzały." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Nie znaleziono żadnych pakietów" @@ -685,6 +685,7 @@ msgstr "" "Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -694,6 +695,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -742,7 +748,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -778,11 +785,11 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -873,7 +880,7 @@ msgstr "Nie udało się utworzyć gniazda" msgid "Could not connect data socket, connection timed out" msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Nie udało się" @@ -1578,16 +1585,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Gotowe" @@ -1595,7 +1602,20 @@ msgstr "Gotowe" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/pt.po b/po/pt.po index d17ec00f8..eb4e58b9d 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -92,7 +92,7 @@ msgid "Total space accounted for: " msgstr "Espaço total contabilizado: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro do pacote %s está dessincronizado." @@ -100,7 +100,7 @@ msgstr "O ficheiro do pacote %s está dessincronizado." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" @@ -679,6 +679,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Falhou executar dpkg. É root?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -688,6 +689,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -735,7 +741,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -771,11 +778,11 @@ msgid "File not found" msgstr "Ficheiro não encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -864,7 +871,7 @@ msgstr "Não foi possível criar um socket" msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível ligar socket de dados, a ligação expirou" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falhou" @@ -1554,16 +1561,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Pronto" @@ -1571,7 +1578,19 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" @@ -1718,8 +1737,8 @@ msgstr "causados por dependências em falta. Isto está OK, somente os erros" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"acima desta mensagem são importantes. Por favor resolva-os e execute " -"[I]nstalar novamente" +"acima desta mensagem são importantes. Por favor resolva-os e execute [I]" +"nstalar novamente" #: dselect/update:30 msgid "Merging available information" diff --git a/po/pt_BR.po b/po/pt_BR.po index edb284aa1..db9c90716 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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." @@ -92,7 +92,7 @@ msgid "Total space accounted for: " msgstr "Total de espaço contabilizado para: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "O arquivo de pacote %s está fora de sincronia." @@ -100,7 +100,7 @@ msgstr "O arquivo de pacote %s está fora de sincronia." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Nenhum pacote encontrado" @@ -680,6 +680,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -707,7 +712,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -743,11 +749,11 @@ msgid "File not found" msgstr "Arquivo não encontrado" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" @@ -836,7 +842,7 @@ msgstr "Não foi possível criar um socket" msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível conectar um socket de dados, conexão expirou" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falhou" @@ -1531,16 +1537,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou coisas" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Pronto" @@ -1548,7 +1554,19 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/ro.po b/po/ro.po index e5be44f06..3d2a48714 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Total spațiu contorizat pentru: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Fișierul pachetului %s este desincronizat." @@ -102,7 +102,7 @@ msgstr "Fișierul pachetului %s este desincronizat." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Nu s-au găsit pachete" @@ -679,6 +679,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -706,7 +711,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -742,11 +748,11 @@ msgid "File not found" msgstr "Fișier negăsit" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -837,7 +843,7 @@ msgstr "" "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a " "expirat" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Eșec" @@ -1536,16 +1542,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Terminat" @@ -1553,7 +1559,20 @@ msgstr "Terminat" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" @@ -1695,8 +1714,8 @@ msgstr "sau erori cauzate de dependențe lipsă. Fiind normal, doar erorile de" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"deasupra acestui mesaj sunt importante. Corectați-le și reporniți " -"[I]nstalarea" +"deasupra acestui mesaj sunt importante. Corectați-le și reporniți [I]" +"nstalarea" #: dselect/update:30 msgid "Merging available information" diff --git a/po/ru.po b/po/ru.po index 4e740f0c2..fdbd20195 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -100,7 +100,7 @@ msgid "Total space accounted for: " msgstr "Полное учтённое пространство: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Список пакетов %s рассинхронизирован." @@ -108,7 +108,7 @@ msgstr "Список пакетов %s рассинхронизирован." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Не найдено ни одного пакета" @@ -683,6 +683,7 @@ msgstr "" "Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -692,6 +693,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -740,7 +746,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -776,11 +783,11 @@ msgid "File not found" msgstr "Файл не найден" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -873,7 +880,7 @@ msgstr "" "Не удалось присоединиться к сокету данных, время на установление соединения " "истекло" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Неудачно" @@ -1575,16 +1582,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Расчёт обновлений…" -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Готово" @@ -1592,7 +1599,20 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/sk.po b/po/sk.po index 815684144..6bb5d6b18 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Celkom priradeného miesta: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Súbor balíkov %s je neaktuálny." @@ -102,7 +102,7 @@ msgstr "Súbor balíkov %s je neaktuálny." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" @@ -671,6 +671,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Vykonanie dpkg zlyhalo. Ste root?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -680,6 +681,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -726,7 +732,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -762,11 +769,11 @@ msgid "File not found" msgstr "Súbor sa nenašiel" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -855,7 +862,7 @@ msgstr "Nedá sa vytvoriť socket" msgid "Could not connect data socket, connection timed out" msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Chyba" @@ -1549,16 +1556,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Hotovo" @@ -1566,7 +1573,20 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/sl.po b/po/sl.po index ad3cae1b9..056a4012f 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Celotna velikost, izračunana za: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Datoteka paketa %s ni usklajena." @@ -102,7 +102,7 @@ msgstr "Datoteka paketa %s ni usklajena." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Noben paket ni bil najden" @@ -233,8 +233,8 @@ msgstr "" " -i Pokaže le pomembne odvisnosti za neujemajoč ukaz.\n" " -c=? Prebere to nastavitveno datoteko\n" " -o=? Nastavi poljubno možnost nastavitve, na primer -o dir::cache=/tmp\n" -"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt." -"conf(5).\n" +"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt.conf" +"(5).\n" #. }}} #: cmdline/apt-cdrom.cc:45 @@ -667,6 +667,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -676,6 +677,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -721,7 +727,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -757,11 +764,11 @@ msgid "File not found" msgstr "Datoteke ni mogoče najti" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -850,7 +857,7 @@ msgstr "Ni mogoče ustvariti vtiča" msgid "Could not connect data socket, connection timed out" msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela." -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Spodletelo" @@ -1548,16 +1555,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Ukaz update ne sprejema argumentov" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Preračunavanje nadgradnje ... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Opravljeno" @@ -1565,7 +1572,21 @@ msgstr "Opravljeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/sv.po b/po/sv.po index fc0243ba1..125cbf332 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogöras för: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Paketfilen %s är inte synkroniserad." @@ -102,7 +102,7 @@ msgstr "Paketfilen %s är inte synkroniserad." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Inga paket hittades" @@ -679,6 +679,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -706,7 +711,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -742,11 +748,11 @@ msgid "File not found" msgstr "Filen hittades inte" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -835,7 +841,7 @@ msgstr "Kunde inte skapa ett uttag (socket)" msgid "Could not connect data socket, connection timed out" msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Misslyckades" @@ -1533,16 +1539,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Färdig" @@ -1550,7 +1556,19 @@ msgstr "Färdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/th.po b/po/th.po index 68dc4d5af..adea9e841 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -92,7 +92,7 @@ msgid "Total space accounted for: " msgstr "พื้นที่ที่นับรวมทั้งหมด: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง" @@ -100,7 +100,7 @@ msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับค #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "ไม่พบแพกเกจ" @@ -655,6 +655,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -664,6 +665,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -708,7 +714,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -743,11 +750,11 @@ msgid "File not found" msgstr "ไม่พบแฟ้ม" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -834,7 +841,7 @@ msgstr "ไม่สามารถสร้างซ็อกเก็ต" msgid "Could not connect data socket, connection timed out" msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "ล้มเหลว" @@ -1505,16 +1512,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "เสร็จแล้ว" @@ -1522,7 +1529,18 @@ msgstr "เสร็จแล้ว" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/tl.po b/po/tl.po index c41b32305..e3f8a3b7e 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -97,7 +97,7 @@ msgid "Total space accounted for: " msgstr "Kabuuan ng puwang na napag-tuosan: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Wala sa sync ang talaksan ng paketeng %s." @@ -105,7 +105,7 @@ msgstr "Wala sa sync ang talaksan ng paketeng %s." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Walang nahanap na mga pakete" @@ -676,6 +676,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -703,7 +708,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -739,11 +745,11 @@ msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -832,7 +838,7 @@ msgstr "Hindi maka-likha ng socket" msgid "Could not connect data socket, connection timed out" msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Bigo" @@ -1520,16 +1526,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Tapos" @@ -1537,7 +1543,19 @@ msgstr "Tapos" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/tr.po b/po/tr.po index 2c549d8a5..26fddd4da 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -94,7 +94,7 @@ msgid "Total space accounted for: " msgstr "Hesaplanan toplam alan: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "%s paket dosyası eşzamansız." @@ -102,7 +102,7 @@ msgstr "%s paket dosyası eşzamansız." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Hiç paket bulunamadı" @@ -673,6 +673,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -682,6 +683,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -728,7 +734,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -764,11 +771,11 @@ msgid "File not found" msgstr "Dosya bulunamadı" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -857,7 +864,7 @@ msgstr "Bir soket oluşturulamadı" msgid "Could not connect data socket, connection timed out" msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Başarısız" @@ -1547,16 +1554,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "'update' komutu bağımsız değişken almamaktadır" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Yükseltme hesaplanıyor... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "İç hata, AllUpgrade bazı şeyleri bozdu" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Bitti" @@ -1564,7 +1571,19 @@ msgstr "Bitti" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/uk.po b/po/uk.po index cff9d1830..cf26e4f41 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -101,7 +101,7 @@ msgid "Total space accounted for: " msgstr "Загальний простір полічений для: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Перелік пакунків %s розсинхронізований." @@ -109,7 +109,7 @@ msgstr "Перелік пакунків %s розсинхронізований. #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Не знайдено жодного пакунка" @@ -683,6 +683,7 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Не вдалося виконати dpkg. Ви root?" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -692,6 +693,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -738,7 +744,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -775,12 +782,12 @@ msgid "File not found" msgstr "Файл не знайдено" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -869,7 +876,7 @@ msgstr "Неможливо створити сокет (socket)" msgid "Could not connect data socket, connection timed out" msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Невдача" @@ -1567,16 +1574,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade щось поламав" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Виконано" @@ -1584,7 +1591,20 @@ msgstr "Виконано" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/vi.po b/po/vi.po index b365fd1f5..31665023e 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+0100\n" "PO-Revision-Date: 2014-01-01 13:45+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -96,7 +96,7 @@ msgid "Total space accounted for: " msgstr "Tổng chỗ đã tính dành cho: " #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Tập tin gói %s không đồng bộ được." @@ -104,7 +104,7 @@ msgstr "Tập tin gói %s không đồng bộ được." #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "Không tìm thấy gói" @@ -691,6 +691,7 @@ msgstr "" "việc này" #: cmdline/apt-mark.cc:381 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -700,6 +701,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -748,7 +754,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -797,11 +804,11 @@ msgid "File not found" msgstr "Không tìm thấy tập tin" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -890,7 +897,7 @@ msgstr "Không thể tạo ổ cắm" msgid "Could not connect data socket, connection timed out" msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Gặp lỗi" @@ -1573,15 +1580,15 @@ msgstr "Đang sắp xếp" msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhận đối số" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "Đang tính toán nâng cấp... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 msgid "Internal error, Upgrade broke stuff" msgstr "Lỗi nội bộ: Upgrade (Nâng cấp) đã làm hỏng thứ gì đó" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "Xong" @@ -1589,7 +1596,18 @@ msgstr "Xong" msgid "Full Text Search" msgstr "Tìm kiếm toàn văn" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "không là gói thật (ảo)" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5aae99b13..f46eebd1e 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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" @@ -93,7 +93,7 @@ msgid "Total space accounted for: " msgstr "总占用空间：" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" @@ -101,7 +101,7 @@ msgstr "软件包文件 %s 尚未同步。" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "没有发现匹配的软件包" @@ -668,6 +668,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -695,7 +700,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -731,11 +737,11 @@ msgid "File not found" msgstr "无法找到该文件" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -823,7 +829,7 @@ msgstr "无法创建套接字" msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失败" @@ -1491,16 +1497,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "完成" @@ -1508,7 +1514,18 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 8f2f085db..9c58bc146 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-01-22 19:02+0100\n" +"POT-Creation-Date: 2014-01-24 23:15+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." @@ -93,7 +93,7 @@ msgid "Total space accounted for: " msgstr "統計後的空間合計：" #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "套件檔 %s 未同步。" @@ -101,7 +101,7 @@ msgstr "套件檔 %s 未同步。" #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:113 apt-private/private-show.cc:115 +#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 msgid "No packages found" msgstr "未找到套件" @@ -661,6 +661,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -688,7 +693,8 @@ msgid "" " install - install packages\n" " remove - remove packages\n" "\n" -" upgrade - upgrade the systems packages\n" +" upgrade - upgrade the system by 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 "" @@ -723,11 +729,11 @@ msgid "File not found" msgstr "找不到檔案" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:617 methods/rred.cc:626 +#: methods/rred.cc:618 methods/rred.cc:627 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 msgid "Failed to set modification time" msgstr "無法設定修改時間" @@ -815,7 +821,7 @@ msgstr "無法建立 Socket" msgid "Could not connect data socket, connection timed out" msgstr "無法和 data socket 連線，連線逾時" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失敗" @@ -1491,16 +1497,16 @@ msgstr "" msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: apt-private/private-upgrade.cc:18 +#: apt-private/private-upgrade.cc:19 msgid "Calculating upgrade... " msgstr "籌備升級中... " -#: apt-private/private-upgrade.cc:23 +#: apt-private/private-upgrade.cc:24 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "內部錯誤，AllUpgrade 造成了損壞" -#: apt-private/private-upgrade.cc:25 +#: apt-private/private-upgrade.cc:26 msgid "Done" msgstr "完成" @@ -1508,7 +1514,19 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:105 +#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-show.cc:152 +#, c-format +msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %lu additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 msgid "not a real package (virtual)" msgstr "" -- cgit v1.2.3 From 655af1e137385aa41c5505edc350111e9f8762ca Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 23:17:30 +0100 Subject: set APT::Sources::Use-Deb822 to default false for now --- apt-pkg/sourcelist.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index bbc514f5b..ac326d157 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -297,7 +297,7 @@ bool pkgSourceList::Read(string File) /* */ bool pkgSourceList::ReadAppend(string File) { - if (_config->FindB("APT::Sources::Use-Deb822", true) == true) + if (_config->FindB("APT::Sources::Use-Deb822", false) == true) { int lines_parsed =ParseFileDeb822(File); if (lines_parsed < 0) -- cgit v1.2.3 From 5d9667d92a9d6973fc001c27d618bc878a4df2ba Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 23:29:10 +0100 Subject: fix test --- test/libapt/sourcelist_test.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 6fc84fd93..0300ce929 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -21,6 +21,8 @@ void remove_tmpfile(void) int main(int argc, char *argv[]) { + _config->Set("APT::Sources::Use-Deb822", true); + const char contents[] = "" "Types: deb\n" "URIs: http://ftp.debian.org/debian\n" -- cgit v1.2.3 From 8c39c4b6e65036390b8ca4d74174192739a4139d Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 24 Jan 2014 23:21:23 +0100 Subject: releasing package apt version 0.9.14.3~exp5 --- configure.ac | 2 +- debian/changelog | 14 +++++++++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 ++-- doc/po/de.po | 68 ++++++++++++++++++++++++++-------------------------- doc/po/es.po | 30 +++++++++++------------ doc/po/fr.po | 34 +++++++++++++------------- doc/po/it.po | 20 ++++++++-------- doc/po/ja.po | 30 +++++++++++------------ doc/po/pl.po | 20 ++++++++-------- doc/po/pt.po | 43 +++++++++++++++++---------------- doc/po/pt_BR.po | 20 ++++++++-------- po/ar.po | 2 +- po/ast.po | 6 ++--- po/bg.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 6 ++--- po/dz.po | 6 ++--- po/el.po | 6 ++--- po/es.po | 10 ++++---- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/hu.po | 2 +- po/it.po | 6 ++--- po/ja.po | 6 ++--- po/km.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/pl.po | 2 +- po/pt.po | 6 ++--- po/pt_BR.po | 2 +- po/ro.po | 6 ++--- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 6 ++--- po/sv.po | 2 +- po/th.po | 2 +- po/tl.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 55 files changed, 216 insertions(+), 201 deletions(-) diff --git a/configure.ac b/configure.ac index 445f5c5e4..5c1900fa3 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.14.3~exp4" +PACKAGE_VERSION="0.9.14.3~exp5" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 0d3c97485..86c69378d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +apt (0.9.14.3~exp5) experimental; urgency=medium + + [ Anthony Towns ] + * methods/rred: minor robustness improvements + + [ Michael Vogt ] + * make "apt-mark help" shows all commands + * make "apt show" output more user friendly + * add "apt full-upgrade" and tweak "apt upgrade" + * set APT::Sources::Use-Deb822=false until the format + is fully finalized + + -- Michael Vogt <mvo@debian.org> Fri, 24 Jan 2014 23:21:04 +0100 + apt (0.9.14.3~exp4) experimental; urgency=medium * implement deb822 suggestions by Anthony Towns and Julian Andres Klode: diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 8ed15f199..f3a24e209 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.14.3~exp4"> +<!ENTITY apt-product-version "0.9.14.3~exp5"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 5d74d583d..f50068f8f 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.14.3~exp4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-24 23:16+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -6186,7 +6186,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/de.po b/doc/po/de.po index c00dd2b67..3e3d19cc3 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+0100\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -763,9 +763,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -3825,12 +3825,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er " -"wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]" -"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in " -"der Form <literal>http::Proxy::<host></literal> mit dem speziellen " -"Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies " -"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird " -"die Umgebungsvariable <envar>http_proxy</envar> benutzt." +"wird standardmäßig in der Form <literal>http://[[Anwender][:" +"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann " +"außerdem in der Form <literal>http::Proxy::<host></literal> mit dem " +"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass " +"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben " +"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:368 @@ -5126,15 +5126,15 @@ msgstr "" "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" "literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> " -"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> (Abschnitt)" -"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes " -"ist, <literal>d.e.f</literal> die Version ist, die zur Installation " -"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die " -"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-" -"Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt " -"oder wenn sie die gleiche Version haben, wie die, die installiert ist. " -"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket " -"erscheint." +"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> " +"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version " +"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur " +"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version " +"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer " +"niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, " +"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die " +"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in " +"dem das Paket erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:1094 @@ -6379,9 +6379,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" -"(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type=" -"\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder " +"type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:586 @@ -6462,9 +6462,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" -"(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type=" -"\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder " +"type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:635 @@ -6567,8 +6567,8 @@ msgid "" "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" -"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@ -8347,9 +8347,9 @@ msgstr "BESCHREIBUNG" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche " "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die " @@ -8760,7 +8760,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " @@ -8943,9 +8943,9 @@ msgstr "" "Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die " "Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " "auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das " -"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]" -"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</" -"tt> ausgeführt wurde." +"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. " +"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get " +"update</tt> ausgeführt wurde." #. type: <p></p> #: guide.sgml:253 diff --git a/doc/po/es.po b/doc/po/es.po index e7397fb80..6ec6eccef 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -848,9 +848,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -6817,10 +6817,10 @@ msgid "" "<literal>APT</literal> will automatically generate a URI with the current " "architecture otherwise." msgstr "" -"<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)" -"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema " -"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto " -"permite que los ficheros <filename>sources.list</filename> sean " +"<literal>distribución</literal> puede contener una variable, <literal>" +"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el " +"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). " +"Esto permite que los ficheros <filename>sources.list</filename> sean " "independientes de la arquitectura. En general, esta característica sólo es " "de interés si se especifica una ruta completa, de lo contrario <literal>APT</" "literal> generará automáticamente una URI con la arquitectura actual del " @@ -8359,9 +8359,9 @@ msgstr "DESCRIPCIÓN" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT es un sistema de gestión de paquetes de software. Dispone de varias " "interfaces para la gestión de paquetes normal del día a día, tales como " @@ -8762,7 +8762,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " @@ -8940,9 +8940,9 @@ msgid "" "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." msgstr "" -"Es necesario actualizar la lista disponible mediante el elemento de menú [A]" -"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de " -"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " +"Es necesario actualizar la lista disponible mediante el elemento de menú " +"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto " +"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " "información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado " "<tt>apt-get update</tt> con anterioridad." diff --git a/doc/po/fr.po b/doc/po/fr.po index c9ba2fb59..333bfad23 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -760,9 +760,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -824,10 +824,10 @@ msgstr "" "déjà installés sans mettre à jour les autres paquets du système. À la " "différence de la commande « upgrade » qui installera la dernière version " "disponible de tous les paquets installés au moment de son exécution, " -"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué" -"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une " -"nouvelle version est disponible, cette version (et ses dépendances, comme " -"décrit plus haut) sera récupérée et installée." +"« install » n'installera la nouvelle version que pour le(s) paquet(s) " +"indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et " +"si une nouvelle version est disponible, cette version (et ses dépendances, " +"comme décrit plus haut) sera récupérée et installée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:139 @@ -8300,9 +8300,9 @@ msgstr "DESCRIPTION" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT est un système de gestion de paquets logiciels. Pour la gestion au " "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en " @@ -8723,7 +8723,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " @@ -8925,11 +8925,11 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" -"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]" -"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour " -"les installer. Lorsque la méthode APT est utilisée, les options « [C]" -"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait " -"l'ensemble des opérations." +"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option " +"« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » " +"pour les installer. Lorsque la méthode APT est utilisée, les options " +"« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » " +"fait l'ensemble des opérations." #. type: <p></p> #: guide.sgml:258 diff --git a/doc/po/it.po b/doc/po/it.po index 11f3dba52..f86cd53f9 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -812,9 +812,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -8328,9 +8328,9 @@ msgstr "DESCRIZIONE" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT è un sistema di gestione per i pacchetti software. Per la normale " "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali " @@ -8384,8 +8384,8 @@ msgid "" "B<reportbug>(1) command." msgstr "" "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, " -"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>" -"(1)." +"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando " +"B<reportbug>(1)." #. type: SH #: apt.8:51 @@ -8736,7 +8736,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index aea2efb4a..e14dbf785 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -800,9 +800,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -3878,10 +3878,10 @@ msgstr "" "るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す" "る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ" "ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ" -"い。URI を構成するコンポーネントに対応する置換変数は、<literal>$(PROXY_USER)" -"</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</" -"literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, " -"<literal>$(SITE_PORT)</literal> です。" +"い。URI を構成するコンポーネントに対応する置換変数は、<literal>" +"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" +"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" +"literal>, <literal>$(SITE_PORT)</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:469 @@ -7991,14 +7991,14 @@ msgstr "説明" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため" -"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>" -"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ" -"ンは B<apt-get>(8) にしか実装されていません。" +"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の " +"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか" +"のオプションは B<apt-get>(8) にしか実装されていません。" #. type: SH #: apt.8:31 @@ -8306,7 +8306,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index 2e27ba210..e130991b7 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -811,9 +811,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -7556,9 +7556,9 @@ msgstr "OPIS" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek " "przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), " @@ -7844,8 +7844,8 @@ msgstr "" "Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw " "ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</" "p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest " -"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list" -"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " +"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources." +"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " "pomocą polecenia <tt>apt-get update</tt>. Na przykład:" #. type: <example></example> @@ -7966,7 +7966,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index f555d41a8..6e04e961a 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -809,9 +809,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -3813,12 +3813,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> define o proxy http predefinido a usar para " -"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]" -"host[:port]/</literal>. Também podem ser especificados proxies por máquina " -"ao usar o formato <literal>http::Proxy::<host></literal> com a palavra " -"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se " -"nenhuma das definições acima for especificada, será usada a variável de " -"ambiente <envar>http_proxy</envar>." +"URIs de HTTP. Está no formato standard de <literal>http://[[user][:" +"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por " +"máquina ao usar o formato <literal>http::Proxy::<host></literal> com a " +"palavra chave especial <literal>DIRECT</literal> que significa não usar " +"proxies. Se nenhuma das definições acima for especificada, será usada a " +"variável de ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:368 @@ -4012,8 +4012,9 @@ msgstr "" "servidor proxy ao que se ligar. Por favor veja &configureindex; para um " "exemplo de como fazer isto. As variáveis de substituição que representam o " "componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>" -"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)" -"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>." +"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>" +"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:469 @@ -8265,9 +8266,9 @@ msgstr "DESCRIÇÃO" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT é um sistema de gestão para pacotes de software. Para a gestão de " "pacotes normal do dia-a-dia existem vários frontends disponíveis, como o " @@ -8546,11 +8547,11 @@ msgid "" "instance," msgstr "" "O primeira <footnote><p>se você está a usar um servidor proxy http você tem " -"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)" -"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> " -"é obter as listas de pacotes a partir das <em>Sources</em> para que ele " -"saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</" -"tt>. Por exemplo," +"que definir a variável de ambiente http_proxy primeiro, veja sources." +"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</" +"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que " +"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get " +"update</tt>. Por exemplo," #. type: <example></example> #: guide.sgml:116 @@ -8669,7 +8670,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 773473ceb..80a8f90d4 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -586,9 +586,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -4903,8 +4903,8 @@ msgid "" "id=\"0\"/>" msgstr "" "Com um arquivo &sources-list; adequado e o arquivo de preferências do APT " -"acima, quaisquer dos comandos a seguir farão com que o APT atualize para a" -"(s) última(s) versão(ões) <literal>testing</literal>." +"acima, quaisquer dos comandos a seguir farão com que o APT atualize para " +"a(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:635 @@ -6291,9 +6291,9 @@ msgstr "" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" #. type: SH @@ -6601,7 +6601,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/po/ar.po b/po/ar.po index ecce809fc..483401781 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/ast.po b/po/ast.po index 80698e3b9..e26ac48e1 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -620,8 +620,8 @@ msgstr "" " -c=? Lleer esti ficheru de configuración\n" " -o=? Afitar una opción de configuración arbitraria, p. ex. -o dir::cache=/" "tmp\n" -"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt.conf" -"(5)\n" +"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt." +"conf(5)\n" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" diff --git a/po/bg.po b/po/bg.po index 6d4986e4a..6dd0822a5 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/bs.po b/po/bs.po index 17a19521c..79cc5ec5d 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/ca.po b/po/ca.po index dcd89b358..342f71b42 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/cs.po b/po/cs.po index 6e6d444c9..83afed769 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/cy.po b/po/cy.po index 5e4269a2a..a57084931 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/da.po b/po/da.po index 414505102..7896cfb00 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/de.po b/po/de.po index b7f145da3..062c446e9 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -1772,8 +1772,8 @@ msgstr "fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und [I]" -"nstallieren Sie erneut." +"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und " +"[I]nstallieren Sie erneut." #: dselect/update:30 msgid "Merging available information" diff --git a/po/dz.po b/po/dz.po index a504b7d0c..5c9a2cfcf 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -612,8 +612,8 @@ msgstr "" " -V བརྡ་དོན་ལེ་ཤཱ་གི་འཐོན་རིམ་ཨང་གྲངས་ཚུ་སྟོན།\n" " -c=? འ་ནི་རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ལྷག\n" " -o=? མཐུན་སྒྲིག་གདམ་ཁ་གི་རིམ་སྒྲིག་ཅིག་གཞི་བཙུགས་འབད་ དཔེན་ན་-o dir::cache=/tmp\n" -"བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་ sources.list(5) དང་apt.conf(5)" -"ལག་ཐོག་\n" +"བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་ sources.list(5) དང་apt." +"conf(5)ལག་ཐོག་\n" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" diff --git a/po/el.po b/po/el.po index d42b7c617..3c723313c 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -1712,8 +1712,8 @@ msgstr "" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε [I]" -"nstall ξανά" +"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε " +"[I]nstall ξανά" #: dselect/update:30 msgid "Merging available information" diff --git a/po/es.po b/po/es.po index 5f91486f0..c8f2f05e4 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -684,8 +684,8 @@ msgstr "" " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria, p. ej. \n" " -o dir::cache=/tmp\n" -"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt.conf" -"(5)\n" +"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt." +"conf(5)\n" "para más información y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" @@ -1778,8 +1778,8 @@ msgstr "" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"encima de este mensaje son importantes. Por favor, corríjalas y ejecute «[I]" -"nstall» otra vez" +"encima de este mensaje son importantes. Por favor, corríjalas y ejecute " +"«[I]nstall» otra vez" #: dselect/update:30 msgid "Merging available information" diff --git a/po/eu.po b/po/eu.po index 9b8cf427b..222cd7fa1 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/fi.po b/po/fi.po index a369c6ce0..4b8c34ab5 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/fr.po b/po/fr.po index ce6ec1a53..bb644f8d5 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/gl.po b/po/gl.po index f0b6c98d5..a3f6596a0 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/hu.po b/po/hu.po index e035f5b94..238737cd3 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/it.po b/po/it.po index 4944388d1..d566d7de7 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -473,8 +473,8 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -"Informazioni sull'architettura non disponibili per %s. Consultare apt.conf" -"(5) APT::Architectures per l'impostazione" +"Informazioni sull'architettura non disponibili per %s. Consultare apt." +"conf(5) APT::Architectures per l'impostazione" #: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 #, c-format diff --git a/po/ja.po b/po/ja.po index 83a3de3d9..02984f34a 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -463,8 +463,8 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf" -"(5) の APT::Architectures を参照してください。" +"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." +"conf(5) の APT::Architectures を参照してください。" #: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 #, c-format diff --git a/po/km.po b/po/km.po index bfde70dc1..c76ef42d3 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/ko.po b/po/ko.po index 84371c06c..5d88f7e89 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/ku.po b/po/ku.po index b0c480c53..d982977f3 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/lt.po b/po/lt.po index bc31fa4df..390ab5cb6 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/mr.po b/po/mr.po index 2fbd3e13c..fc382d9bc 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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 " diff --git a/po/nb.po b/po/nb.po index 285537d3f..835cd4d15 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/ne.po b/po/ne.po index 8238870e5..a64e22bab 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/nl.po b/po/nl.po index 5ecfd3b26..3ae34ade3 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/nn.po b/po/nn.po index 5ccf56d13..937597248 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/pl.po b/po/pl.po index eda56e551..832a17000 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/pt.po b/po/pt.po index eb4e58b9d..3618f52ec 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -1737,8 +1737,8 @@ msgstr "causados por dependências em falta. Isto está OK, somente os erros" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"acima desta mensagem são importantes. Por favor resolva-os e execute [I]" -"nstalar novamente" +"acima desta mensagem são importantes. Por favor resolva-os e execute " +"[I]nstalar novamente" #: dselect/update:30 msgid "Merging available information" diff --git a/po/pt_BR.po b/po/pt_BR.po index db9c90716..1e7596ba2 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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." diff --git a/po/ro.po b/po/ro.po index 3d2a48714..af121cc95 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -1714,8 +1714,8 @@ msgstr "sau erori cauzate de dependențe lipsă. Fiind normal, doar erorile de" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"deasupra acestui mesaj sunt importante. Corectați-le și reporniți [I]" -"nstalarea" +"deasupra acestui mesaj sunt importante. Corectați-le și reporniți " +"[I]nstalarea" #: dselect/update:30 msgid "Merging available information" diff --git a/po/ru.po b/po/ru.po index fdbd20195..88e6d3a00 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/sk.po b/po/sk.po index 6bb5d6b18..e4f6f1180 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/sl.po b/po/sl.po index 056a4012f..bab9da29c 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" @@ -233,8 +233,8 @@ msgstr "" " -i Pokaže le pomembne odvisnosti za neujemajoč ukaz.\n" " -c=? Prebere to nastavitveno datoteko\n" " -o=? Nastavi poljubno možnost nastavitve, na primer -o dir::cache=/tmp\n" -"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt.conf" -"(5).\n" +"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt." +"conf(5).\n" #. }}} #: cmdline/apt-cdrom.cc:45 diff --git a/po/sv.po b/po/sv.po index 125cbf332..29731acea 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/th.po b/po/th.po index adea9e841..0fc6417db 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/tl.po b/po/tl.po index e3f8a3b7e..6fd552706 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/tr.po b/po/tr.po index 26fddd4da..dcef63cc9 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/uk.po b/po/uk.po index cf26e4f41..058a451e0 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/vi.po b/po/vi.po index 31665023e..9453cc2de 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+0100\n" "PO-Revision-Date: 2014-01-01 13:45+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index f46eebd1e..13fb44f8c 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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" diff --git a/po/zh_TW.po b/po/zh_TW.po index 9c58bc146..cbf0f314d 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-01-24 23:15+0100\n" +"POT-Creation-Date: 2014-01-24 23:31+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." -- cgit v1.2.3 From 2f958de6e883ba7b0c9895750d4dde35047f1e82 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 25 Jan 2014 01:00:23 +0100 Subject: use svg in doxygen and ensure dot is around for it --- debian/control | 2 +- doc/Doxyfile.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index c70d0e9ea..f3303e891 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake -Build-Depends-Indep: doxygen, debiandoc-sgml +Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz Build-Conflicts: autoconf2.13, automake1.4 Vcs-Git: git://anonscm.debian.org/apt/apt.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index a0087cd2c..9ebbd9673 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -880,7 +880,7 @@ HTML_OUTPUT = html # each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. -HTML_FILE_EXTENSION = .html +HTML_FILE_EXTENSION = .xhtml # The HTML_HEADER tag can be used to specify a personal HTML header for # each generated HTML page. If it is left blank doxygen will generate a @@ -1715,7 +1715,7 @@ DOT_NUM_THREADS = 0 # the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the # directory containing the font. -DOT_FONTNAME = FreeSans +DOT_FONTNAME = # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. # The default size is 10pt. @@ -1815,7 +1815,7 @@ DIRECTORY_GRAPH = YES # HTML_FILE_EXTENSION to xhtml in order to make the SVG files # visible in IE 9+ (other browsers do not have this requirement). -DOT_IMAGE_FORMAT = png +DOT_IMAGE_FORMAT = svg # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to # enable generation of interactive SVG images that allow zooming and panning. @@ -1824,7 +1824,7 @@ DOT_IMAGE_FORMAT = png # need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files # visible. Older versions of IE do not have SVG support. -INTERACTIVE_SVG = NO +INTERACTIVE_SVG = YES # The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. -- cgit v1.2.3 From 41e6bd080db8995bc7617569f0719bccc31e0da8 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 25 Jan 2014 14:53:03 +0100 Subject: support " " in deb822 source options --- apt-pkg/sourcelist.cc | 8 +++++++- test/integration/test-apt-sources-deb822 | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 4e580ba04..8462027c5 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -20,6 +20,7 @@ #include <apt-pkg/tagfile.h> #include <fstream> +#include <algorithm> #include <apti18n.h> /*}}}*/ @@ -94,7 +95,12 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List, }; for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++) if (Tags.Exists(option_deb822[j])) - Options[option_internal[j]] = Tags.FindS(option_deb822[j]); + { + // for deb822 the " " is the delimiter, but the backend expects "," + std::string option = Tags.FindS(option_deb822[j]); + std::replace(option.begin(), option.end(), ' ', ','); + Options[option_internal[j]] = option; + } // now create one item per suite/section string Suite = Tags.FindS("Suites"); diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 6e9a02417..723796018 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -66,7 +66,7 @@ testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/P msgtest 'Test deb822' 'architecture option' echo "$BASE" > $SOURCES -echo "Architectures: amd64,armel" >> $SOURCES +echo "Architectures: amd64 armel" >> $SOURCES testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : -- cgit v1.2.3 From 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 25 Jan 2014 21:57:26 +0100 Subject: releasing package apt version 0.9.15 --- configure.ac | 2 +- debian/changelog | 6 ++++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 ++-- doc/po/de.po | 2 +- doc/po/es.po | 2 +- doc/po/fr.po | 2 +- doc/po/it.po | 2 +- doc/po/ja.po | 2 +- doc/po/pl.po | 2 +- doc/po/pt.po | 2 +- doc/po/pt_BR.po | 2 +- po/ar.po | 38 +++++++++++++++++++------------------- po/ast.po | 38 +++++++++++++++++++------------------- po/bg.po | 38 +++++++++++++++++++------------------- po/bs.po | 38 +++++++++++++++++++------------------- po/ca.po | 38 +++++++++++++++++++------------------- po/cs.po | 38 +++++++++++++++++++------------------- po/cy.po | 38 +++++++++++++++++++------------------- po/da.po | 38 +++++++++++++++++++------------------- po/de.po | 38 +++++++++++++++++++------------------- po/dz.po | 38 +++++++++++++++++++------------------- po/el.po | 38 +++++++++++++++++++------------------- po/es.po | 38 +++++++++++++++++++------------------- po/eu.po | 38 +++++++++++++++++++------------------- po/fi.po | 38 +++++++++++++++++++------------------- po/fr.po | 38 +++++++++++++++++++------------------- po/gl.po | 38 +++++++++++++++++++------------------- po/hu.po | 38 +++++++++++++++++++------------------- po/it.po | 38 +++++++++++++++++++------------------- po/ja.po | 38 +++++++++++++++++++------------------- po/km.po | 38 +++++++++++++++++++------------------- po/ko.po | 38 +++++++++++++++++++------------------- po/ku.po | 38 +++++++++++++++++++------------------- po/lt.po | 38 +++++++++++++++++++------------------- po/mr.po | 38 +++++++++++++++++++------------------- po/nb.po | 38 +++++++++++++++++++------------------- po/ne.po | 38 +++++++++++++++++++------------------- po/nl.po | 38 +++++++++++++++++++------------------- po/nn.po | 38 +++++++++++++++++++------------------- po/pl.po | 38 +++++++++++++++++++------------------- po/pt.po | 38 +++++++++++++++++++------------------- po/pt_BR.po | 38 +++++++++++++++++++------------------- po/ro.po | 38 +++++++++++++++++++------------------- po/ru.po | 38 +++++++++++++++++++------------------- po/sk.po | 38 +++++++++++++++++++------------------- po/sl.po | 38 +++++++++++++++++++------------------- po/sv.po | 38 +++++++++++++++++++------------------- po/th.po | 38 +++++++++++++++++++------------------- po/tl.po | 38 +++++++++++++++++++------------------- po/tr.po | 38 +++++++++++++++++++------------------- po/uk.po | 38 +++++++++++++++++++------------------- po/vi.po | 38 +++++++++++++++++++------------------- po/zh_CN.po | 38 +++++++++++++++++++------------------- po/zh_TW.po | 38 +++++++++++++++++++------------------- 55 files changed, 835 insertions(+), 829 deletions(-) diff --git a/configure.ac b/configure.ac index 5c1900fa3..2c306d10f 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.14.3~exp5" +PACKAGE_VERSION="0.9.15" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 86c69378d..e915246e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.9.15) unstable; urgency=low + + * upload version from debian/experimental to unstable + + -- Michael Vogt <mvo@debian.org> Sat, 25 Jan 2014 21:57:00 +0100 + apt (0.9.14.3~exp5) experimental; urgency=medium [ Anthony Towns ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index f3a24e209..2b5a6fd47 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.14.3~exp5"> +<!ENTITY apt-product-version "0.9.15"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index f50068f8f..8153f70a5 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.14.3~exp4\n" +"Project-Id-Version: apt-doc 0.9.15\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/doc/po/de.po b/doc/po/de.po index 3e3d19cc3..3c9799fe1 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+0100\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" diff --git a/doc/po/es.po b/doc/po/es.po index 6ec6eccef..9d46fa676 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" diff --git a/doc/po/fr.po b/doc/po/fr.po index 333bfad23..9b9794129 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" diff --git a/doc/po/it.po b/doc/po/it.po index f86cd53f9..7b4389e99 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" diff --git a/doc/po/ja.po b/doc/po/ja.po index e14dbf785..a67b0a1fd 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" diff --git a/doc/po/pl.po b/doc/po/pl.po index e130991b7..657b5f785 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" diff --git a/doc/po/pt.po b/doc/po/pt.po index 6e04e961a..768b1cae3 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 80a8f90d4..35e6d1c19 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" diff --git a/po/ar.po b/po/ar.po index 483401781..92337eccd 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1498,8 +1498,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2513,82 +2513,82 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" diff --git a/po/ast.po b/po/ast.po index e26ac48e1..17daf7a0d 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1625,8 +1625,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2723,85 +2723,85 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinia %u enforma llarga na llista d'oríxenes %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" diff --git a/po/bg.po b/po/bg.po index 6dd0822a5..4f7a62959 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1660,8 +1660,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2762,89 +2762,89 @@ msgstr "Неуспех при анализирането на пакетен ф msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма " "стойност)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." diff --git a/po/bs.po b/po/bs.po index 79cc5ec5d..af741ea7a 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1493,8 +1493,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2508,82 +2508,82 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" diff --git a/po/ca.po b/po/ca.po index 342f71b42..1a7974a9a 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1647,8 +1647,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2746,85 +2746,85 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" diff --git a/po/cs.po b/po/cs.po index 83afed769..90f329cad 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1637,8 +1637,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2722,82 +2722,82 @@ msgstr "Nelze zpracovat soubor %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" diff --git a/po/cy.po b/po/cy.po index a57084931..f03fbf0f6 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1651,8 +1651,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2767,87 +2767,87 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" diff --git a/po/da.po b/po/da.po index 7896cfb00..62507db69 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1662,8 +1662,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2754,82 +2754,82 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Åbner %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" diff --git a/po/de.po b/po/de.po index 062c446e9..190e7d012 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1693,8 +1693,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2807,83 +2807,83 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet." -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." diff --git a/po/dz.po b/po/dz.po index 5c9a2cfcf..db2efb4d8 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1612,8 +1612,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2711,82 +2711,82 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" diff --git a/po/el.po b/po/el.po index 3c723313c..08c593d5c 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1632,8 +1632,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2734,82 +2734,82 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " diff --git a/po/es.po b/po/es.po index c8f2f05e4..17b0f3a49 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1698,8 +1698,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2806,88 +2806,88 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene " "asociado un valor)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" diff --git a/po/eu.po b/po/eu.po index 222cd7fa1..9f1fb15e8 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1620,8 +1620,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2713,82 +2713,82 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" diff --git a/po/fi.po b/po/fi.po index 4b8c34ab5..e352a20a4 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1612,8 +1612,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2704,82 +2704,82 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" diff --git a/po/fr.po b/po/fr.po index bb644f8d5..532af8d91 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1702,8 +1702,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2814,93 +2814,93 @@ msgstr "Impossible de traiter le fichier %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser " "[option])" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une " "affectation)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de " "valeur)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" diff --git a/po/gl.po b/po/gl.po index a3f6596a0..c51f5a027 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1649,8 +1649,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2753,86 +2753,86 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal construída na lista de orixes %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de orixes %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal construída na lista de orixes %s (tipo)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" diff --git a/po/hu.po b/po/hu.po index 238737cd3..86bde5cee 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1654,8 +1654,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2754,92 +2754,92 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] " "feldolgozhatatlan)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl " "rövid)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "érvényes hozzárendelés)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "tartalmaz kulcsot)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak " "nincs értéke)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" diff --git a/po/it.po b/po/it.po index d566d7de7..e52d9124f 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1684,8 +1684,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2796,92 +2796,92 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file di pacchetto %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non " "analizzabile)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo " "corta)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è " "un'assegnazione)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una " "chiave)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non " "ha un valore)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La riga %lu nel file %s non è corretta (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La riga %lu nel file %s non è corretta (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La riga %lu nel file %s non è corretta (absolute dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La riga %lu nel file %s non è corretta (dist parse)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Apertura di %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riga %u troppo lunga nel file %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La riga %u nel file %s non è corretta (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" diff --git a/po/ja.po b/po/ja.po index 02984f34a..8c8e6f4b8 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1652,8 +1652,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2742,86 +2742,86 @@ msgstr "パッケージファイル %s を解釈することができません ( msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" diff --git a/po/km.po b/po/km.po index c76ef42d3..4f170e3d8 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1594,8 +1594,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2683,82 +2683,82 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1 msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "កំពុង​បើក​ %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" diff --git a/po/ko.po b/po/ko.po index 5d88f7e89..53ab363a9 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1609,8 +1609,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2698,83 +2698,83 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" diff --git a/po/ku.po b/po/ku.po index d982977f3..983afbe57 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1498,8 +1498,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2526,82 +2526,82 @@ msgstr "Pakêt nehate dîtin %s" msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" diff --git a/po/lt.po b/po/lt.po index 390ab5cb6..28f2cc6f3 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1516,8 +1516,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2615,82 +2615,82 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Atveriama %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" diff --git a/po/mr.po b/po/mr.po index fc382d9bc..7cb972fa1 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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 " @@ -1598,8 +1598,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2687,82 +2687,82 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s उघडत आहे" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " diff --git a/po/nb.po b/po/nb.po index 835cd4d15..8a3e058ad 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1623,8 +1623,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2717,82 +2717,82 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" diff --git a/po/ne.po b/po/ne.po index a64e22bab..ff80aaa67 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1595,8 +1595,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2685,82 +2685,82 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" diff --git a/po/nl.po b/po/nl.po index 3ae34ade3..af8172202 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1643,8 +1643,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2751,83 +2751,83 @@ msgstr "Kon pakketbestand %s niet ontleden (1)" msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" diff --git a/po/nn.po b/po/nn.po index 937597248..c7bd904ee 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1606,8 +1606,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2691,82 +2691,82 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" diff --git a/po/pl.po b/po/pl.po index 832a17000..d6634bef1 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1685,8 +1685,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2786,84 +2786,84 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" diff --git a/po/pt.po b/po/pt.po index 3618f52ec..c1ae5e6f7 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1657,8 +1657,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2762,85 +2762,85 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 1e7596ba2..24c4ae30c 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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." @@ -1629,8 +1629,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2729,87 +2729,87 @@ msgstr "Impossível analisar arquivo de pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" diff --git a/po/ro.po b/po/ro.po index af121cc95..00546ccf2 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1635,8 +1635,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2739,82 +2739,82 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" diff --git a/po/ru.po b/po/ru.po index 88e6d3a00..d7dfea572 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1679,8 +1679,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2787,86 +2787,86 @@ msgstr "Невозможно разобрать содержимое пакет msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет " "значения)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" diff --git a/po/sk.po b/po/sk.po index e4f6f1180..ee6956593 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1653,8 +1653,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2742,83 +2742,83 @@ msgstr "Súbor %s sa nedá spracovať (1)" msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" diff --git a/po/sl.po b/po/sl.po index bab9da29c..b9bfd6c44 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1653,8 +1653,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2744,88 +2744,88 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče " "razčleniti)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima " "vrednosti)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Odpiranje %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" diff --git a/po/sv.po b/po/sv.po index 29731acea..68195dd85 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1640,8 +1640,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2742,82 +2742,82 @@ msgstr "Kunde inte tolka paketfilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Rad %lu i källistan %s har fel format ([option] för kort)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" diff --git a/po/th.po b/po/th.po index 0fc6417db..ff6bca59b 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1607,8 +1607,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2684,82 +2684,82 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1 msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "กำลังเปิด %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" diff --git a/po/tl.po b/po/tl.po index 6fd552706..bc7e5f3c3 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1618,8 +1618,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2722,82 +2722,82 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" diff --git a/po/tr.po b/po/tr.po index dcef63cc9..2eaaec692 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1650,8 +1650,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2752,94 +2752,94 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)" msgid "Unable to parse package file %s (2)" msgstr "Paket dosyası %s ayrıştırılamadı (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] " "ayrıştırılamıyor)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama " "değil)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin " "anahtarı yok)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s " "anahtarına değer atanmamış)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "%s Açılıyor" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" diff --git a/po/uk.po b/po/uk.po index 058a451e0..8121d9839 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1671,8 +1671,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2787,84 +2787,84 @@ msgstr "Неможливо проаналізувати файл пакунку msgid "Unable to parse package file %s (2)" msgstr "Неможливо проаналізувати файл пакунку %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Рядок %u є занадто довгим у переліку джерел %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворений рядок %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" diff --git a/po/vi.po b/po/vi.po index 9453cc2de..64f332887 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+0100\n" "PO-Revision-Date: 2014-01-01 13:45+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -1674,8 +1674,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2789,91 +2789,91 @@ msgstr "Không thể phân tích tập tin gói %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " "tích được)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " "gán)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " "trị)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Đang mở %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." diff --git a/po/zh_CN.po b/po/zh_CN.po index 13fb44f8c..4f3edaafc 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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" @@ -1591,8 +1591,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2673,82 +2673,82 @@ msgstr "无法解析软件包文件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" diff --git a/po/zh_TW.po b/po/zh_TW.po index cbf0f314d..18aac83ea 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-01-24 23:31+0100\n" +"POT-Creation-Date: 2014-01-25 22:21+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." @@ -1589,8 +1589,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265 -#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 +#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 +#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 #, c-format msgid "Unable to read %s" @@ -2673,82 +2673,82 @@ msgstr "無法辨識套件檔 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:118 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:155 +#: apt-pkg/sourcelist.cc:161 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:158 +#: apt-pkg/sourcelist.cc:164 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:169 +#: apt-pkg/sourcelist.cc:175 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:181 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:197 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:196 +#: apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" -#: apt-pkg/sourcelist.cc:209 +#: apt-pkg/sourcelist.cc:215 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:320 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "正在開啟 %s" -#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "來源列表 %2$s 中的第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:356 +#: apt-pkg/sourcelist.cc:362 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" -#: apt-pkg/sourcelist.cc:360 +#: apt-pkg/sourcelist.cc:366 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/sourcelist.cc:401 +#: apt-pkg/sourcelist.cc:407 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -- cgit v1.2.3 From abaf0b8831bfb415137b10f56d89d3180906be38 Mon Sep 17 00:00:00 2001 From: Chris Leick <c.leick@vollbio.de> Date: Sun, 26 Jan 2014 15:44:45 +0100 Subject: Trivian unfuzzies of the German po4a translation --- doc/po/de.po | 127 +++++++++++++++++++++++------------------------------------ 1 file changed, 49 insertions(+), 78 deletions(-) diff --git a/doc/po/de.po b/doc/po/de.po index 61f99ee81..883aa49a8 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,29 +1,14 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# Translation of apt-doc to German +# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. +# This file is distributed under the same license as the apt-doc package. +# Chris Leick <c.leick@vollbio.de>, 2009-2014. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2014-01-26 08:14+0100\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#~ # Translation of apt-doc to German -#~ # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -#~ # This file is distributed under the same license as the apt-doc package. -#~ # Chris Leick <c.leick@vollbio.de>, 2009-2014. -#~ # -#~ msgid "" -#~ msgstr "" -#~ "Project-Id-Version: apt-doc 0.9.14.2\n" -#~ "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +"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-01-24 12:29+0100\n" -"PO-Revision-Date: 2014-01-21 20:59+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" "Language: de\n" @@ -6733,10 +6718,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:82 -#, fuzzy, no-wrap -#| msgid "deb [ options ] uri distribution [component1] [component2] [...]" +#, no-wrap msgid "deb [ options ] uri suite [component1] [component2] [...]" -msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]" +msgstr "deb [ Optionen ] URI Suite [Komponente1] [Komponente2] […]" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml:86 @@ -6760,6 +6744,23 @@ msgid "" " [option1]: [option1-value]\n" " " msgstr "" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" +" Sections: Komponente1 Komponente2\n" +" Description: short\n" +" long long long\n" +" [Option1]: [Option1-Wert]\n" +"\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" +" Sections: Komponente1 Komponente2\n" +" Enabled: no\n" +" Description: short\n" +" long long long\n" +" [Option1]: [Option1-Wert]\n" +" " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:84 @@ -6767,19 +6768,11 @@ msgid "" "Alternatively a rfc822 style format is also supported: <placeholder type=" "\"literallayout\" id=\"0\"/>" msgstr "" +"Alternativ wird auch ein Format im Stil von RFC822 unterstützt: <placeholder " +"type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:105 -#, fuzzy -#| msgid "" -#| "The URI for the <literal>deb</literal> type must specify the base of the " -#| "Debian distribution, from which APT will find the information it needs. " -#| "<literal>distribution</literal> can specify an exact path, in which case " -#| "the components must be omitted and <literal>distribution</literal> must " -#| "end with a slash (<literal>/</literal>). This is useful for the case when " -#| "only a particular sub-section of the archive denoted by the URI is of " -#| "interest. If <literal>distribution</literal> does not specify an exact " -#| "path, at least one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -6792,25 +6785,15 @@ msgid "" msgstr "" "Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-" "Distribution angeben, wo APT die Informationen findet, die es benötigt. " -"<literal>Distribution</literal> kann einen genauen Pfad angeben. In diesem " -"Fall müssen die Komponenten weggelassen werden und <literal>Distribution</" -"literal> muss mit einem Schrägstrich (<literal>/</literal>) enden. Dies ist " -"nützlich, wenn nur ein bestimmter Unterabschnitt des von der URI angegebenen " -"Archivs von Interesse ist. Wenn <literal>Distribution</literal> keinen " -"genauen Pfad angibt, muss mindestens eine <literal>Komponente</literal> " -"angegeben sein." +"<literal>Suite</literal> kann einen genauen Pfad angeben. In diesem Fall " +"müssen die Komponenten weggelassen werden und <literal>Suite</literal> muss " +"mit einem Schrägstrich (<literal>/</literal>) enden. Dies ist nützlich, wenn " +"nur ein bestimmter Unterabschnitt des von der URI angegebenen Archivs von " +"Interesse ist. Wenn <literal>Suite</literal> keinen genauen Pfad angibt, muss " +"mindestens eine <literal>Komponente</literal> angegeben sein." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:114 -#, fuzzy -#| msgid "" -#| "<literal>distribution</literal> may also contain a variable, <literal>" -#| "$(ARCH)</literal> which expands to the Debian architecture (such as " -#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -#| "This permits architecture-independent <filename>sources.list</filename> " -#| "files to be used. In general this is only of interest when specifying an " -#| "exact path, <literal>APT</literal> will automatically generate a URI with " -#| "the current architecture otherwise." msgid "" "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" "literal> which expands to the Debian architecture (such as <literal>amd64</" @@ -6820,8 +6803,8 @@ msgid "" "<literal>APT</literal> will automatically generate a URI with the current " "architecture otherwise." msgstr "" -"<literal>distribution</literal> könnte außerdem eine Variable, <literal>" -"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " +"<literal>Suite</literal> könnte außerdem eine Variable, " +"<literal>$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " "<literal>amd64</literal> oder <literal>armel</literal>) expandiert wird, die " "auf dem System benutzt wird. Dies erlaubt es, architekturunabhängige " "<filename>sources.list</filename>-Dateien zu benutzen. Im Allgemeinen ist " @@ -6831,19 +6814,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 -#, fuzzy -#| msgid "" -#| "Since only one distribution can be specified per line it may be necessary " -#| "to have multiple lines for the same URI, if a subset of all available " -#| "distributions or components at that location is desired. APT will sort " -#| "the URI list after it has generated a complete set internally, and will " -#| "collapse multiple references to the same Internet host, for instance, " -#| "into a single connection, so that it does not inefficiently establish an " -#| "FTP connection, close it, do something else, and then re-establish a " -#| "connection to that same host. This feature is useful for accessing busy " -#| "FTP sites with limits on the number of simultaneous anonymous users. APT " -#| "also parallelizes connections to different hosts to more effectively deal " -#| "with sites with low bandwidth." msgid "" "In the traditional style sources.list format since only one distribution can " "be specified per line it may be necessary to have multiple lines for the " @@ -6857,18 +6827,19 @@ msgid "" "users. APT also parallelizes connections to different hosts to more " "effectively deal with sites with low bandwidth." msgstr "" -"Da pro Zeile nur eine Distribution angegeben werden kann, könnte es nötig " -"sein, mehrere Zeilen für die gleiche URI zu haben, falls eine Untermenge " -"aller verfügbarer Distributionen oder Komponenten von diesem Ort gewünscht " -"wird. APT wird die URI-Liste sortieren, nachdem es intern eine komplette " -"Zusammenstellung generiert hat und es wird mehrere Bezüge zum gleichen " -"Internet-Rechner zusammenfassen, zum Beispiel zu einer einzigen Verbindung, " -"so dass es nicht ineffizient FTP-Verbindungen herstellt, sie schließt, sonst " -"etwas tut und dann erneut eine Verbindung zum gleichen Rechner herstellt. " -"Diese Funktion ist nützlich für den Zugriff auf ausgelastete FTP-Sites mit " -"Begrenzungen der Anzahl gleichzeitiger anonymer Anwender. APT parallelisiert " -"außerdem Verbindungen zu verschiedenen Rechnern, um effektiver mit Orten " -"niedriger Bandbreite hauszuhalten." +"In der Sources.list im herkömmlichen Formatstil könnte es nötig sein, da pro " +"Zeile nur eine Distribution angegeben werden kann, mehrere Zeilen für die " +"gleiche URI zu haben, falls eine Untermenge aller verfügbarer Distributionen " +"oder Komponenten von diesem Ort gewünscht wird. APT wird die URI-Liste " +"sortieren, nachdem es intern eine komplette Zusammenstellung generiert hat " +"und es wird mehrere Bezüge zum gleichen Internet-Rechner zusammenfassen, zum " +"Beispiel zu einer einzigen Verbindung, so dass es nicht ineffizient " +"FTP-Verbindungen herstellt, sie schließt, sonst etwas tut und dann erneut " +"eine Verbindung zum gleichen Rechner herstellt. Diese Funktion ist nützlich " +"für den Zugriff auf ausgelastete FTP-Sites mit Begrenzungen der Anzahl " +"gleichzeitiger anonymer Anwender. APT parallelisiert außerdem Verbindungen zu " +"verschiedenen Rechnern, um effektiver mit Orten niedriger Bandbreite " +"hauszuhalten." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:136 -- cgit v1.2.3 From a0db467c7eb0e63b8e74887403689e2b446dde7f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sun, 26 Jan 2014 13:06:31 +0100 Subject: fixup merge issues introduced in 796673c Issues in doc/po/de.po (fixed by Chris already) and test/integration/framework Git-Dch: Ignore --- test/integration/framework | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 5439244f7..5b9a58568 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -880,7 +880,8 @@ changetowebserver() { fi if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then cd aptarchive - if ! aptwebserver -o aptwebserver::fork=1 "$@" >webserver.log 2>&1 ; then + local LOG="webserver.log" + if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then cat $LOG false fi @@ -1006,7 +1007,6 @@ testequal() { fi local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile" - addtrap "rm $COMPAREFILE;" echo "$1" > $COMPAREFILE shift -- cgit v1.2.3 From bae81c1307e956aa8928c9d6a77830fb733cd61f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sun, 26 Jan 2014 15:29:10 +0100 Subject: enable deb822 sources for associated testcase Git-Dch: Ignore --- test/integration/test-apt-sources-deb822 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 742adb5e2..87f1886ea 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -7,6 +7,8 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture 'i386' +echo 'APT::Sources::Use-Deb822 "true";' > rootdir/etc/apt/apt.conf.d/00enabledeb822 + SOURCES='rootdir/etc/apt/sources.list' BASE='# some comment # that contains a : as well @@ -19,13 +21,13 @@ Sections: main Description: summay and the long part' -msgtest 'Test old-style sources.list' +msgtest 'Test sources.list' 'old style' echo "deb http://ftp.debian.org/debian stable main" > $SOURCES testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris -msgtest 'Test simple deb822 sources.list' +msgtest 'Test sources.list' 'simple deb822' echo "$BASE" > $SOURCES testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : -- cgit v1.2.3 From 6f43fac607c94f423f1d01708ecf947a8a303d38 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Tue, 28 Jan 2014 17:20:19 +0100 Subject: add test for Suite with path --- test/integration/test-apt-sources-deb822 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 87f1886ea..5f54b7531 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -99,3 +99,14 @@ testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/source/Source 'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris + +# a Suite +msgtest 'Test deb822 sources.list file which has' 'a exact path and no sections' +cat > $SOURCES <<EOF +Types: deb +URIs: http://emacs.naquadah.org +Suites: stable/ +EOF +testequal --nomsg "'http://emacs.naquadah.org/stable/Packages.bz2' emacs.naquadah.org_stable_Packages 0 : +'http://emacs.naquadah.org/stable/en.bz2' emacs.naquadah.org_stable_en 0 : +'http://emacs.naquadah.org/stable/InRelease' emacs.naquadah.org_stable_InRelease 0 " aptget update --print-uris -- cgit v1.2.3 From 6ae22905f66064f46c0abf05d269e47869c664be Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 29 Jan 2014 10:37:17 +0100 Subject: fix apt-get download truncation (closes: #736962) --- cmdline/apt-get.cc | 9 ++++++--- test/integration/test-apt-get-download | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index da7d28a1e..6bff6e7de 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -678,14 +678,17 @@ bool DoDownload(CommandLine &CmdL) // copy files in local sources to the current directory for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); ++I) - if ((*I)->Local == true && (*I)->Status == pkgAcquire::Item::StatDone) + { + std::string const filename = cwd + flNotDir((*I)->DestFile); + if ((*I)->Local == true && + filename != (*I)->DestFile && + (*I)->Status == pkgAcquire::Item::StatDone) { - std::string const filename = cwd + flNotDir((*I)->DestFile); std::ifstream src((*I)->DestFile.c_str(), std::ios::binary); std::ofstream dst(filename.c_str(), std::ios::binary); dst << src.rdbuf(); } - + } return Failed == false; } /*}}}*/ diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index fce0be018..c2a5c3d8e 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -24,6 +24,7 @@ testdownload() { rm $1 } +# normal case(es) testdownload apt_1.0_all.deb apt stable testdownload apt_2.0_all.deb apt @@ -32,3 +33,9 @@ testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) SHA512:$(sh # deb:677887 testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms + +# deb:736962 - apt-get download foo && +aptget download apt +aptget download apt +testsuccess test -s apt_2.0_all.deb +rm -f apt_1.0_all.deb -- cgit v1.2.3 From e62aa1dd8099aeb8bb667253ca22c56b93f521d1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 29 Jan 2014 23:02:51 +0100 Subject: pkgTagFile: if we have seen the end, do not try to see more Asking for more via Step() will notice that we are done with the file already and will result in a fail, which means we can't find the last sections anymore (which is especially painful if we haven't moved at all as in the testcase we haven't even looked at one of the sources leading to a strange behaviour) Reported-By: Niall Walsh <niallwalsh@users.berlios.de> --- apt-pkg/tagfile.cc | 6 ++++- test/integration/test-apt-get-source-multisources | 30 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100755 test/integration/test-apt-get-source-multisources diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index b92b2c15a..832a40d1e 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -207,7 +207,11 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset) unsigned long long Dist = Offset - d->iOffset; d->Start += Dist; d->iOffset += Dist; - return Step(Tag); + // if we have seen the end, don't ask for more + if (d->Done == true) + return Tag.Scan(d->Start, d->End - d->Start); + else + return Step(Tag); } // Reposition and reload.. diff --git a/test/integration/test-apt-get-source-multisources b/test/integration/test-apt-get-source-multisources new file mode 100755 index 000000000..cc759e8c1 --- /dev/null +++ b/test/integration/test-apt-get-source-multisources @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'armhf' + +insertsource 'unstable' 'adduser' 'all' '3.113+nmu3' +insertsource 'stable' 'python-fll' 'all' '0.9.11' + +insertpackage 'unstable' 'adduser' 'all' '3.113+nmu3' +insertpackage 'stable' 'python-fll' 'all' '0.9.11' + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +HEADER="Reading package lists... +Building dependency tree..." +testequal "$HEADER +Need to get 0 B of source archives. +'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e +'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -qdy --print-uris --dsc-only adduser=3.113 python-fll=0.9.11 + +testequal "$HEADER +Need to get 0 B of source archives. +'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e +'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -qdy --print-uris --dsc-only python-fll=0.9.11 adduser=3.113 -- cgit v1.2.3 From 6a9c9d63edc878ff268cdaa4f985ca50c48380b0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 29 Jan 2014 23:24:41 +0100 Subject: restart debSrcRecordParsers only if needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The offset variable in DebSrcRecordParser was not initialized which we now do and based on it do not trigger a restart if the parser was not used yet avoiding a needless rescan of the section. Detected while working on the previous commit e62aa1dd. Both commits act as a "fix" for the bug shown in the testcase of the commit – this one here would only hide it through. --- apt-pkg/deb/debsrcrecords.h | 6 +++--- apt-pkg/srcrecords.cc | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 5d2a67f4f..a8fb465bb 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -30,7 +30,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser public: - virtual bool Restart() {return Tags.Jump(Sect,0);}; + virtual bool Restart() {return Jump(0);}; virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);}; virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);}; @@ -50,8 +50,8 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Files(std::vector<pkgSrcRecords::File> &F); debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) - : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), - Buffer(NULL) {} + : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), + iOffset(0), Buffer(NULL) {} virtual ~debSrcRecordParser(); }; diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 297559957..60b62850a 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -70,8 +70,9 @@ bool pkgSrcRecords::Restart() Current = Files.begin(); for (std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I) - (*I)->Restart(); - + if ((*I)->Offset() != 0) + (*I)->Restart(); + return true; } /*}}}*/ -- cgit v1.2.3 From 25d99f3b42ada24679ddc1d911530425acc8e475 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 30 Jan 2014 00:11:05 +0100 Subject: fix various style/performance warnings in rred Reported-By: cppcheck Git-Dch: Ignore --- methods/gpgv.cc | 1 - methods/http.cc | 1 - methods/rred.cc | 67 +++++++++++++++++++++------------------------------------ 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/methods/gpgv.cc b/methods/gpgv.cc index ea8a26fd4..25bf64ddd 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -8,7 +8,6 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/gpgv.h> -#include <utime.h> #include <stdio.h> #include <fcntl.h> #include <errno.h> diff --git a/methods/http.cc b/methods/http.cc index e1390afcb..96c4e3ca0 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -36,7 +36,6 @@ #include <sys/stat.h> #include <sys/time.h> -#include <utime.h> #include <unistd.h> #include <signal.h> #include <stdio.h> diff --git a/methods/rred.cc b/methods/rred.cc index d17ab110d..f7dac3c19 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -20,12 +20,12 @@ #include <vector> #include <iterator> +#include <fcntl.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> -#include <utime.h> #include <apti18n.h> @@ -37,11 +37,9 @@ class MemBlock { char *free; struct MemBlock *next; - MemBlock(size_t size) + MemBlock(size_t size) : size(size), next(NULL) { free = start = new char[size]; - size = size; - next = NULL; } size_t avail(void) { return size - (free - start); } @@ -157,7 +155,7 @@ class FileChanges { #ifdef POSDEBUG size_t cpos = 0; std::list<struct Change>::iterator x; - for (x = changes.begin(); x != where; x++) { + for (x = changes.begin(); x != where; ++x) { assert(x != changes.end()); cpos += x->offset + x->add_cnt; } @@ -208,7 +206,7 @@ class FileChanges { left(); } std::list<struct Change>::iterator next = where; - next++; + ++next; while (next != changes.end() && next->offset == 0) { where->del_cnt += next->del_cnt; @@ -221,7 +219,7 @@ class FileChanges { where->add_cnt = next->add_cnt; next = changes.erase(next); } else { - next++; + ++next; } } } @@ -261,7 +259,7 @@ class FileChanges { if (where != changes.end()) where->offset -= offset; changes.insert(where, Change(offset)); - where--; + --where; assert(pos_is_okay()); } @@ -284,26 +282,10 @@ class FileChanges { before.add_len -= where->add_len; changes.insert(where, before); - where--; + --where; assert(pos_is_okay()); } - size_t check_next_offset(size_t max) - { - assert(pos_is_okay()); - if (max > 0) - { - where++; - if (where != changes.end()) { - if (where->offset < max) - max = where->offset; - } - where--; - assert(pos_is_okay()); - } - return max; - } - void delete_lines(size_t cnt) { std::list<struct Change>::iterator x = where; @@ -317,7 +299,7 @@ class FileChanges { x->skip_lines(del); cnt -= del; - x++; + ++x; if (x == changes.end()) { del = cnt; } else { @@ -334,7 +316,7 @@ class FileChanges { void left(void) { assert(pos_is_okay()); - where--; + --where; pos -= where->offset + where->add_cnt; assert(pos_is_okay()); } @@ -342,7 +324,7 @@ class FileChanges { void right(void) { assert(pos_is_okay()); pos += where->offset + where->add_cnt; - where++; + ++where; assert(pos_is_okay()); } }; @@ -378,11 +360,10 @@ class Patch { static void dump_lines(FILE *o, FILE *i, size_t n, Hashes *hash) { char buffer[BLOCK_SIZE]; - size_t l; while (n > 0) { if (fgets(buffer, sizeof(buffer), i) == 0) buffer[0] = '\0'; - l = strlen(buffer); + size_t const l = strlen(buffer); if (l == 0 || buffer[l-1] == '\n') n--; retry_fwrite(buffer, l, o, hash); @@ -392,11 +373,10 @@ class Patch { static void skip_lines(FILE *i, int n) { char buffer[BLOCK_SIZE]; - size_t l; while (n > 0) { if (fgets(buffer, sizeof(buffer), i) == 0) buffer[0] = '\0'; - l = strlen(buffer); + size_t const l = strlen(buffer); if (l == 0 || buffer[l-1] == '\n') n--; } @@ -490,14 +470,14 @@ class Patch { { size_t line = 0; std::list<struct Change>::reverse_iterator ch; - for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) { + for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) { line += ch->offset + ch->del_cnt; } - for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) { + for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) { std::list<struct Change>::reverse_iterator mg_i, mg_e = ch; while (ch->del_cnt == 0 && ch->offset == 0) - ch++; + ++ch; line -= ch->del_cnt; if (ch->add_cnt > 0) { if (ch->del_cnt == 0) { @@ -526,7 +506,7 @@ class Patch { void apply_against_file(FILE *out, FILE *in, Hashes *hash = NULL) { std::list<struct Change>::iterator ch; - for (ch = filechanges.begin(); ch != filechanges.end(); ch++) { + for (ch = filechanges.begin(); ch != filechanges.end(); ++ch) { dump_lines(out, in, ch->offset, hash); skip_lines(in, ch->del_cnt); dump_mem(out, ch->add, ch->add_len, hash); @@ -575,7 +555,7 @@ class RredMethod : public pkgAcqMethod { std::string patch_name; for (std::vector<std::string>::iterator I = patchpaths.begin(); I != patchpaths.end(); - I++) + ++I) { patch_name = *I; if (Debug == true) @@ -617,11 +597,12 @@ class RredMethod : public pkgAcqMethod { stat(patch_name.c_str(), &bufpatch) != 0) return _error->Errno("stat", _("Failed to stat")); - struct utimbuf timebuf; - timebuf.actime = bufbase.st_atime; - timebuf.modtime = bufpatch.st_mtime; - if (utime(Itm->DestFile.c_str(), &timebuf) != 0) - return _error->Errno("utime", _("Failed to set modification time")); + struct timespec times[2]; + times[0].tv_sec = bufbase.st_atime; + times[1].tv_sec = bufpatch.st_mtime; + times[0].tv_nsec = times[1].tv_nsec = 0; + if (utimensat(AT_FDCWD, Itm->DestFile.c_str(), times, 0) != 0) + return _error->Errno("utimensat",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(), &bufbase) != 0) return _error->Errno("stat", _("Failed to stat")); @@ -635,7 +616,7 @@ class RredMethod : public pkgAcqMethod { } public: - RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig) {} + RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig), Debug(false) {} }; int main(int argc, char **argv) -- cgit v1.2.3 From 960975a175c2a21df749727162d5677cdc97a36e Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 30 Jan 2014 15:06:26 +0100 Subject: do not crash if VF.File()/VF.File().Archive() is NULL --- apt-private/private-output.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index a8bbad9e5..e9b8037da 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -68,8 +68,10 @@ std::string GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver) pkgCache::VerFileIterator VF = ver.FileList(); for (; VF.end() == false ; ++VF) { - // XXX: how to figure out the relevant suite? if its in multiple ones? - suite = suite + "," + VF.File().Archive(); + if(VF.File() == NULL || VF.File().Archive() == NULL) + suite = suite + "," + _("unknown"); + else + suite = suite + "," + VF.File().Archive(); //suite = VF.File().Archive(); } suite = suite.erase(0, 1); -- cgit v1.2.3 From 4afa7d18b37661996d188959ba7917824e1545d3 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 31 Jan 2014 08:57:34 +0100 Subject: show "status" in apt list last --- apt-private/private-output.cc | 49 +++++++++++++++++++------------------- test/integration/test-apt-cli-list | 18 +++++++------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index e9b8037da..2ae112af4 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -190,45 +190,44 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ // raring/linux-kernel version [upradable: new-version] // description pkgPolicy *policy = CacheFile.GetPolicy(); - out << std::setiosflags(std::ios::left) - << _config->Find("APT::Color::Highlight", "") - << name_str - << _config->Find("APT::Color::Neutral", "") - << "/" << suite - << " "; + std::string VersionStr = GetVersion(CacheFile, V); + std::string CandidateVerStr = GetCandidateVersion(CacheFile, P); + std::string InstalledVerStr = GetInstalledVersion(CacheFile, P); + std::string StatusStr; if(P.CurrentVer() == V && state.Upgradable()) { - out << GetVersion(CacheFile, V) - << " " - << "[" << _("installed,upgradable to: ") - << GetCandidateVersion(CacheFile, P) << "]"; + strprintf(StatusStr, _("[installed,upgradable to: %s]"), + CandidateVerStr.c_str()); } else if (P.CurrentVer() == V) { - out << GetVersion(CacheFile, V) - << " "; if(!V.Downloadable()) - out << _("[installed,local]"); + StatusStr = _("[installed,local]"); else if(V.Automatic() && state.Garbage) - out << _("[installed,auto-removable]"); + StatusStr = _("[installed,auto-removable]"); else if (state.Flags & pkgCache::Flag::Auto) - out << _("[installed,automatic]"); + StatusStr = _("[installed,automatic]"); else - out << _("[installed]"); + StatusStr = _("[installed]"); } else if (P.CurrentVer() && policy->GetCandidateVer(P) == V && state.Upgradable()) { - out << GetVersion(CacheFile, V) - << " " - << _("[upgradable from: ") - << GetInstalledVersion(CacheFile, P) << "]"; + strprintf(StatusStr, _("[upgradable from: %s]"), + InstalledVerStr.c_str()); } else { if (V.ParentPkg()->CurrentState == pkgCache::State::ConfigFiles) - out << GetVersion(CacheFile, V) - << " " - << _("[residual-config]"); + StatusStr = _("[residual-config]"); else - out << GetVersion(CacheFile, V); + StatusStr = ""; } - out << " " << GetArchitecture(CacheFile, P); + out << std::setiosflags(std::ios::left) + << _config->Find("APT::Color::Highlight", "") + << name_str + << _config->Find("APT::Color::Neutral", "") + << "/" << suite + << " " + << VersionStr << " " + << GetArchitecture(CacheFile, P); + if (StatusStr != "") + out << " " << StatusStr; if (include_summary) { out << std::endl diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list index 8d5df9051..47507aeb8 100755 --- a/test/integration/test-apt-cli-list +++ b/test/integration/test-apt-cli-list @@ -18,30 +18,30 @@ setupaptarchive APTARCHIVE=$(readlink -f ./aptarchive) testequal "Listing... -bar/now 1.0 [installed,local] i386 +bar/now 1.0 i386 [installed,local] foo/unstable 1.0 all -foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list +foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list testequal "Listing... foo/unstable 1.0 all -foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list "foo*" +foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list "foo*" testequal "Listing... -foobar/unstable 2.0 [upgradable from: 1.0] i386" apt list --upgradable +foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable # FIXME: hm, hm - does it make sense to have this different? shouldn't # we use "installed,upgradable" consitently? testequal "Listing... -bar/now 1.0 [installed,local] i386 -foobar/now 1.0 [installed,upgradable to: 2.0] i386" apt list --installed +bar/now 1.0 i386 [installed,local] +foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed testequal "Listing... -foobar/unstable 2.0 [upgradable from: 1.0] i386 -foobar/now 1.0 [installed,upgradable to: 2.0] i386 +foobar/unstable 2.0 i386 [upgradable from: 1.0] +foobar/now 1.0 i386 [installed,upgradable to: 2.0] " apt list foobar --all-versions testequal "Listing... -bar/now 1.0 [installed,local] i386 +bar/now 1.0 i386 [installed,local] an autogenerated dummy bar=1.0/installed " apt list bar --verbose -- cgit v1.2.3 From 0dfc7eef47519bd6b48ceaa4341b72ec40560988 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@ubuntu.com> Date: Tue, 4 Feb 2014 10:18:16 +0100 Subject: Fix multiarch package upgrade issue When checking for negative dependencies in MarkInstall() ensure that only dependencies that are relevant (i.e. getting installed) are checked. --- apt-pkg/depcache.cc | 5 +++++ test/integration/test-bug-multiarch-upgrade | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100755 test/integration/test-bug-multiarch-upgrade diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index f9c891c86..a3bb4fd3d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1253,6 +1253,11 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (PkgState[Pkg->ID].InstallVer == 0) continue; + /* Ignore negative dependencies that we are not going to + get installed */ + if (PkgState[Pkg->ID].InstallVer != *I) + continue; + if ((Start->Version != 0 || TrgPkg != Pkg) && PkgState[Pkg->ID].CandidateVer != PkgState[Pkg->ID].InstallVer && PkgState[Pkg->ID].CandidateVer != *I && diff --git a/test/integration/test-bug-multiarch-upgrade b/test/integration/test-bug-multiarch-upgrade new file mode 100755 index 000000000..dc3725df1 --- /dev/null +++ b/test/integration/test-bug-multiarch-upgrade @@ -0,0 +1,29 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertinstalledpackage 'libcups2' 'amd64' '1' 'Multi-Arch: same' +insertinstalledpackage 'libcups2' 'i386' '1' 'Multi-Arch: same' + +insertpackage 'unstable' 'libcups2' 'amd64' '0' 'Multi-Arch: same' +insertpackage 'unstable' 'libcups2' 'amd64' '2' 'Multi-Arch: same' +insertpackage 'unstable' 'libcups2' 'i386' '0' 'Multi-Arch: same' +insertpackage 'unstable' 'libcups2' 'i386' '2' 'Multi-Arch: same' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libcups2 +The following packages will be upgraded: + libcups2 libcups2:i386 +2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst libcups2 [1] (2 unstable [amd64]) [libcups2:amd64 on libcups2:i386] [libcups2:i386 on libcups2:amd64] [libcups2:i386 ] +Inst libcups2:i386 [1] (2 unstable [i386]) +Conf libcups2 (2 unstable [amd64]) +Conf libcups2:i386 (2 unstable [i386])' aptget install -s libcups2:i386 -- cgit v1.2.3 From 33b813ce44c7bafeb2a36b66fd004f8d94a2cbe4 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 5 Feb 2014 17:35:33 +0100 Subject: move isatty() check into InitOutput() --- apt-private/private-output.cc | 3 +++ cmdline/apt-get.cc | 4 ---- cmdline/apt.cc | 2 -- test/integration/test-apt-cli-upgrade | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 2ae112af4..420ca14d5 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -30,6 +30,9 @@ unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */ bool InitOutput() /*{{{*/ { + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) + _config->Set("quiet","1"); + c0out.rdbuf(cout.rdbuf()); c1out.rdbuf(cout.rdbuf()); c2out.rdbuf(cout.rdbuf()); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6bff6e7de..1019ff325 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1736,10 +1736,6 @@ int main(int argc,const char *argv[]) /*{{{*/ // see if we are in simulate mode CheckSimulateMode(CmdL); - // Deal with stdout not being a tty - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); - // Setup the output streams InitOutput(); diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 6fe25e3f3..6ad470faa 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -156,8 +156,6 @@ int main(int argc, const char *argv[]) /*{{{*/ << std::endl << std::endl; } - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); // See if the help should be shown if (_config->FindB("help") == true || diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade index 163a55576..21ce69413 100755 --- a/test/integration/test-apt-cli-upgrade +++ b/test/integration/test-apt-cli-upgrade @@ -16,8 +16,7 @@ setupaptarchive APTARCHIVE=$(readlink -f ./aptarchive) # default is to allow new dependencies -testequal "Calculating upgrade... Done -The following NEW packages will be installed: +testequal "The following NEW packages will be installed: foo-new-dependency The following packages will be upgraded: foo @@ -28,7 +27,6 @@ Conf foo-new-dependency (2.0 unstable [all]) Conf foo (2.0 unstable [all])" apt upgrade -qq -s # ensure -testequal "Calculating upgrade... Done -The following packages have been kept back: +testequal "The following packages have been kept back: foo 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs -- cgit v1.2.3 From 446551c8ffd2c9cb9dcd707c94590e73009f7dd9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Feb 2014 00:13:10 +0100 Subject: discard impossible candidates in MarkInstall If a (Pre-)Depends can't be satisfied there is no point in keeping the candidate as is as it is impossible to find a solution for it, so we can just as well reset the candidate to the currently installed version. We avoid trying to install this impossible candidate later on this way. Closes: #735967 --- apt-pkg/depcache.cc | 9 ++- .../test-bug-735967-lib32-to-i386-unavailable | 86 ++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) create mode 100755 test/integration/test-bug-735967-lib32-to-i386-unavailable diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index f9c891c86..7e75a6fe3 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1134,8 +1134,13 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl; if (Start.IsCritical() == false) continue; - // if the dependency was critical, we can't install it, so remove it again - MarkDelete(Pkg,false,Depth + 1, false); + // if the dependency was critical, we have absolutely no chance to install it, + // so if it wasn't installed remove it again. If it was, discard the candidate + // as the problemresolver will trip over it otherwise trying to install it (#735967) + if (Pkg->CurrentVer == 0) + MarkDelete(Pkg,false,Depth + 1, false); + else + SetCandidateVersion(Pkg.CurrentVer()); return false; } diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable new file mode 100755 index 000000000..4dbe1d25d --- /dev/null +++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable @@ -0,0 +1,86 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'i386' 'amd64' + +insertpackage 'unstable' 'lib32nss-mdns' 'amd64' '0.10-6' 'Depends: libnss-mdns-i386 (= 0.10-6)' +insertpackage 'unstable' 'libnss-mdns' 'amd64,i386' '0.10-6' 'Multi-Arch: same +Breaks: lib32nss-mdns (<< 0.10-6)' +insertpackage 'unstable' 'libnss-mdns-i386' 'i386' '0.10-6' 'Multi-Arch: foreign +Depends: libnss-mdns' + +insertpackage 'unstable' 'foo' 'amd64' '1' 'Depends: libfoo' +insertpackage 'unstable' 'libfoo' 'amd64' '1' 'Depends: libfoo-bin' +insertpackage 'unstable' 'libfoo-bin' 'i386' '0.10-6' 'Multi-Arch: foreign' + +insertinstalledpackage 'lib32nss-mdns' 'amd64' '0.9-1' +insertinstalledpackage 'libnss-mdns' 'amd64' '0.9-1' + +insertinstalledpackage 'i-make-packages-important' 'all' '1' 'Depends: libnss-mdns' + +setupaptarchive --no-update + +# make libnss-mdns-i386 unavailable +configarchitecture 'amd64' +testsuccess aptget update + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + lib32nss-mdns +The following packages will be upgraded: + libnss-mdns +1 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv lib32nss-mdns [0.9-1] +Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64]) +Conf libnss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo : Depends: libfoo but it is not going to be installed +E: Unable to correct problems, you have held broken packages.' aptget install foo -s + +# activate multiarch +configarchitecture 'amd64' 'i386' +testsuccess aptget update + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libnss-mdns:i386 libnss-mdns-i386:i386 +The following packages will be upgraded: + lib32nss-mdns libnss-mdns +2 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst lib32nss-mdns [0.9-1] (0.10-6 unstable [amd64]) [] +Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64]) [] +Inst libnss-mdns:i386 (0.10-6 unstable [i386]) [] +Inst libnss-mdns-i386:i386 (0.10-6 unstable [i386]) +Conf libnss-mdns:i386 (0.10-6 unstable [i386]) +Conf libnss-mdns (0.10-6 unstable [amd64]) +Conf libnss-mdns-i386:i386 (0.10-6 unstable [i386]) +Conf lib32nss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libfoo libfoo-bin:i386 +The following NEW packages will be installed: + foo libfoo libfoo-bin:i386 +0 upgraded, 3 newly installed, 0 to remove and 2 not upgraded. +Inst libfoo-bin:i386 (0.10-6 unstable [i386]) +Inst libfoo (1 unstable [amd64]) +Inst foo (1 unstable [amd64]) +Conf libfoo-bin:i386 (0.10-6 unstable [i386]) +Conf libfoo (1 unstable [amd64]) +Conf foo (1 unstable [amd64])' aptget install foo -s -- cgit v1.2.3 From cc130d7114425cc6f8c315e6cbc68be2cb4d3c38 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@ubuntu.com> Date: Thu, 30 Jan 2014 14:08:08 +0000 Subject: multicompress with externals sets wrong file modes Copy from the bug description: After we upgraded the Ubuntu master archive from lucid to precise, we noticed that Translation-en.bz2 was being written with mode 0600 rather than 0644, which broke our mirroring. This is no longer reproducible as such in unstable because apt now links against libbz2, but it's still reproducible with xz; it happens because multicompress fchmods one end of the compression pipe in this case rather than the target file. [Original testcase slightly modified to comply with house-style] Closes: 737130 --- ftparchive/multicompress.cc | 2 +- .../test-bug-737130-multicompress-file-modes | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100755 test/integration/test-bug-737130-multicompress-file-modes diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 265fb1a80..c1bd6037a 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -365,7 +365,7 @@ bool MultiCompress::Child(int const &FD) for (Files *I = Outputs; I != 0; I = I->Next) { // Set the correct file modes - fchmod(I->TmpFile.Fd(),Permissions); + chmod(I->TmpFile.Name().c_str(),Permissions); if (rename(I->TmpFile.Name().c_str(),I->Output.c_str()) != 0) _error->Errno("rename",_("Failed to rename %s to %s"), diff --git a/test/integration/test-bug-737130-multicompress-file-modes b/test/integration/test-bug-737130-multicompress-file-modes new file mode 100755 index 000000000..7df6339a2 --- /dev/null +++ b/test/integration/test-bug-737130-multicompress-file-modes @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'i386' + +cat >aptarchive/ftparchive.conf <<EOF +Dir { ArchiveDir "$(pwd)/aptarchive"; CacheDir "$(pwd)/aptarchive"; }; +Default { Translation::Compress ". gzip bzip2 xz"; FileMode 0644; }; +tree "dists/sid" { + Sections "main"; + Architectures "i386"; + LongDescription "false"; +}; +EOF +mkdir -p aptarchive/dists/sid/main/binary-i386 +mkdir -p aptarchive/dists/sid/main/i18n +testsuccess aptftparchive generate aptarchive/ftparchive.conf +i18n=aptarchive/dists/sid/main/i18n +for comp in '' .gz .bz2 .xz; do + msgtest 'Test apt-ftparchive file mode is 644 for' "Translation-en$comp" + FILEMODE="$(stat --format %a "$i18n/Translation-en$comp")" + if [ "$FILEMODE" != '644' ]; then + msgfail "Mode was '$FILEMODE'!" + else + msgpass + fi +done -- cgit v1.2.3 From 9f2df510b17f6b64801677915f5c25f73290d3f4 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 6 Feb 2014 18:10:48 +0100 Subject: releasing package apt version 0.9.15.1 --- configure.ac | 2 +- debian/changelog | 26 ++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 6 +- doc/po/de.po | 45 +++--- doc/po/es.po | 4 +- doc/po/fr.po | 4 +- doc/po/it.po | 4 +- doc/po/ja.po | 4 +- doc/po/pl.po | 4 +- doc/po/pt.po | 4 +- doc/po/pt_BR.po | 4 +- po/ar.po | 376 +++++++++++++++++++++++++------------------------- po/ast.po | 376 +++++++++++++++++++++++++------------------------- po/bg.po | 376 +++++++++++++++++++++++++------------------------- po/bs.po | 376 +++++++++++++++++++++++++------------------------- po/ca.po | 376 +++++++++++++++++++++++++------------------------- po/cs.po | 376 +++++++++++++++++++++++++------------------------- po/cy.po | 376 +++++++++++++++++++++++++------------------------- po/da.po | 376 +++++++++++++++++++++++++------------------------- po/de.po | 376 +++++++++++++++++++++++++------------------------- po/dz.po | 376 +++++++++++++++++++++++++------------------------- po/el.po | 376 +++++++++++++++++++++++++------------------------- po/es.po | 376 +++++++++++++++++++++++++------------------------- po/eu.po | 376 +++++++++++++++++++++++++------------------------- po/fi.po | 376 +++++++++++++++++++++++++------------------------- po/fr.po | 376 +++++++++++++++++++++++++------------------------- po/gl.po | 376 +++++++++++++++++++++++++------------------------- po/hu.po | 376 +++++++++++++++++++++++++------------------------- po/it.po | 376 +++++++++++++++++++++++++------------------------- po/ja.po | 376 +++++++++++++++++++++++++------------------------- po/km.po | 376 +++++++++++++++++++++++++------------------------- po/ko.po | 376 +++++++++++++++++++++++++------------------------- po/ku.po | 376 +++++++++++++++++++++++++------------------------- po/lt.po | 376 +++++++++++++++++++++++++------------------------- po/mr.po | 376 +++++++++++++++++++++++++------------------------- po/nb.po | 376 +++++++++++++++++++++++++------------------------- po/ne.po | 376 +++++++++++++++++++++++++------------------------- po/nl.po | 376 +++++++++++++++++++++++++------------------------- po/nn.po | 376 +++++++++++++++++++++++++------------------------- po/pl.po | 376 +++++++++++++++++++++++++------------------------- po/pt.po | 376 +++++++++++++++++++++++++------------------------- po/pt_BR.po | 376 +++++++++++++++++++++++++------------------------- po/ro.po | 376 +++++++++++++++++++++++++------------------------- po/ru.po | 376 +++++++++++++++++++++++++------------------------- po/sk.po | 376 +++++++++++++++++++++++++------------------------- po/sl.po | 376 +++++++++++++++++++++++++------------------------- po/sv.po | 377 ++++++++++++++++++++++++++------------------------- po/th.po | 376 +++++++++++++++++++++++++------------------------- po/tl.po | 376 +++++++++++++++++++++++++------------------------- po/tr.po | 376 +++++++++++++++++++++++++------------------------- po/uk.po | 376 +++++++++++++++++++++++++------------------------- po/vi.po | 376 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 376 +++++++++++++++++++++++++------------------------- po/zh_TW.po | 376 +++++++++++++++++++++++++------------------------- 55 files changed, 8372 insertions(+), 7906 deletions(-) diff --git a/configure.ac b/configure.ac index 2c306d10f..a49c9a479 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" +PACKAGE_VERSION="0.9.15.1" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index e915246e2..40085985f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +apt (0.9.15.1) unstable; urgency=medium + + [ David Kalnischkies ] + * use gpg --homedir instead of explicit file placement + * use svg in doxygen and ensure dot is around for it + * pkgTagFile: if we have seen the end, do not try to see more + * restart debSrcRecordParsers only if needed + * discard impossible candidates in MarkInstall (Closes: #735967) + + [ Chris Leick ] + * update german manpage translation + * Trivian unfuzzies of the German po4a translation + + [ Michael Vogt ] + * fix apt-get download truncation (closes: #736962) + * do not crash if VF.File()/VF.File().Archive() is NULL + * show "status" in apt list last to be more awk friendly + (thanks to Axel Beckert) + * Fix multiarch package upgrade issue + * add test for Suite with path + + [ Colin Watson ] + * multicompress with externals sets wrong file modes (Closes: 737130) + + -- Michael Vogt <mvo@debian.org> Thu, 06 Feb 2014 18:09:19 +0100 + apt (0.9.15) unstable; urgency=low * upload version from debian/experimental to unstable diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 2b5a6fd47..a96c84d3a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15"> +<!ENTITY apt-product-version "0.9.15.1"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 8153f70a5..36aa51ff9 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.15\n" +"Project-Id-Version: apt-doc 0.9.15.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -6186,7 +6186,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/de.po b/doc/po/de.po index 883aa49a8..6914f6fdc 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-01-24 12:29+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -6789,8 +6789,8 @@ msgstr "" "müssen die Komponenten weggelassen werden und <literal>Suite</literal> muss " "mit einem Schrägstrich (<literal>/</literal>) enden. Dies ist nützlich, wenn " "nur ein bestimmter Unterabschnitt des von der URI angegebenen Archivs von " -"Interesse ist. Wenn <literal>Suite</literal> keinen genauen Pfad angibt, muss " -"mindestens eine <literal>Komponente</literal> angegeben sein." +"Interesse ist. Wenn <literal>Suite</literal> keinen genauen Pfad angibt, " +"muss mindestens eine <literal>Komponente</literal> angegeben sein." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:114 @@ -6803,14 +6803,14 @@ msgid "" "<literal>APT</literal> will automatically generate a URI with the current " "architecture otherwise." msgstr "" -"<literal>Suite</literal> könnte außerdem eine Variable, " -"<literal>$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " -"<literal>amd64</literal> oder <literal>armel</literal>) expandiert wird, die " -"auf dem System benutzt wird. Dies erlaubt es, architekturunabhängige " -"<filename>sources.list</filename>-Dateien zu benutzen. Im Allgemeinen ist " -"dies nur von Interesse, wenn ein genauer Pfad angegeben wird, andernfalls " -"wird <literal>APT</literal> automatisch eine URI mit der aktuellen " -"Architektur generieren." +"<literal>Suite</literal> könnte außerdem eine Variable, <literal>$(ARCH)</" +"literal>, enthalten, die zur Debian-Architektur (wie <literal>amd64</" +"literal> oder <literal>armel</literal>) expandiert wird, die auf dem System " +"benutzt wird. Dies erlaubt es, architekturunabhängige <filename>sources." +"list</filename>-Dateien zu benutzen. Im Allgemeinen ist dies nur von " +"Interesse, wenn ein genauer Pfad angegeben wird, andernfalls wird " +"<literal>APT</literal> automatisch eine URI mit der aktuellen Architektur " +"generieren." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 @@ -6833,12 +6833,12 @@ msgstr "" "oder Komponenten von diesem Ort gewünscht wird. APT wird die URI-Liste " "sortieren, nachdem es intern eine komplette Zusammenstellung generiert hat " "und es wird mehrere Bezüge zum gleichen Internet-Rechner zusammenfassen, zum " -"Beispiel zu einer einzigen Verbindung, so dass es nicht ineffizient " -"FTP-Verbindungen herstellt, sie schließt, sonst etwas tut und dann erneut " -"eine Verbindung zum gleichen Rechner herstellt. Diese Funktion ist nützlich " -"für den Zugriff auf ausgelastete FTP-Sites mit Begrenzungen der Anzahl " -"gleichzeitiger anonymer Anwender. APT parallelisiert außerdem Verbindungen zu " -"verschiedenen Rechnern, um effektiver mit Orten niedriger Bandbreite " +"Beispiel zu einer einzigen Verbindung, so dass es nicht ineffizient FTP-" +"Verbindungen herstellt, sie schließt, sonst etwas tut und dann erneut eine " +"Verbindung zum gleichen Rechner herstellt. Diese Funktion ist nützlich für " +"den Zugriff auf ausgelastete FTP-Sites mit Begrenzungen der Anzahl " +"gleichzeitiger anonymer Anwender. APT parallelisiert außerdem Verbindungen " +"zu verschiedenen Rechnern, um effektiver mit Orten niedriger Bandbreite " "hauszuhalten." #. type: Content of: <refentry><refsect1><para> @@ -6876,7 +6876,7 @@ msgstr "" "heruntergeladen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:146 msgid "" "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>," @@ -8739,6 +8739,15 @@ msgstr "" #. type: <p></p> #: guide.sgml:163 +#, fuzzy +#| msgid "" +#| "<prgn>apt-get</prgn> has several command line options that are detailed " +#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +#| "option is <tt>-d</tt> which does not install the fetched files. If the " +#| "system has to download a large number of package it would be undesired to " +#| "start installing them in case something goes wrong. When <tt>-d</tt> is " +#| "used the downloaded archives can be installed by simply running the " +#| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " "its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " diff --git a/doc/po/es.po b/doc/po/es.po index 9d46fa676..6e277b452 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -8762,7 +8762,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/fr.po b/doc/po/fr.po index 9b9794129..11d4bfeb7 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -8723,7 +8723,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/it.po b/doc/po/it.po index 7b4389e99..97fa23697 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -8736,7 +8736,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index a67b0a1fd..57dad234e 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -8306,7 +8306,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index 657b5f785..b0311d96f 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -7966,7 +7966,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index 768b1cae3..24d74f0e5 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -8670,7 +8670,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 35e6d1c19..4c6f1bb5b 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+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" @@ -6601,7 +6601,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/po/ar.po b/po/ar.po index 92337eccd..a524dc0e2 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -305,23 +305,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -329,151 +329,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -546,7 +546,7 @@ msgstr "%s هي النسخة الأحدث.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -639,16 +639,16 @@ msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون ل msgid "Disk not found." msgstr "لم يُعثر على القرص." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "لم يُعثر على الملف" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -657,34 +657,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "تسجيل الدخول" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "رفض الخادم اتصالنا بالرد: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "فشل USER، ردّ الخادم: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "فشل PASS، ردّ الخادم: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -692,121 +692,121 @@ msgstr "" "تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin " "فارغ." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "فشل TYPE، ردّ الخادم: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "انتهى وقت الاتصال" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "خطأ في القراءة" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "خطأ في الكتابة" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "فشل" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "تعذر إرسال الأمر PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "فشل EPRT، ردّ الخادم: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "فشل نقل البيانات، ردّ الخادم '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "استعلام" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "" @@ -872,70 +872,70 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" @@ -971,11 +971,11 @@ msgstr "نسق تاريخ مجهول" msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "خطأ داخلي" @@ -1212,101 +1212,108 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟" msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [مُثبّتة]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " أو" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1314,27 +1321,27 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" @@ -1343,7 +1350,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1351,21 +1358,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1423,10 +1430,6 @@ msgstr "تمّ" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1537,11 +1540,11 @@ msgstr "فشل إغلاق الملف %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "" @@ -1808,29 +1811,36 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "realloc - فشل تعيين الذاكرة" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "تعذر فتح %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:163 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#: ftparchive/override.cc:175 #, c-format -msgid "Failed to read the override file %s" +msgid "Malformed override %s line %llu #2" +msgstr "" + +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" msgstr "" #: ftparchive/multicompress.cc:70 @@ -1860,20 +1870,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "خطأ داخلي، تعذر إنشاء %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" @@ -1987,12 +1997,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "فشلت كتابة الملف %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" @@ -2105,14 +2115,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2508,7 +2518,7 @@ msgstr "فشلت كتابة الملف %s" msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -3008,49 +3018,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3095,12 +3105,12 @@ msgstr "" msgid "Installing %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "تهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "إزالة %s" @@ -3121,111 +3131,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "تحضير %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "فتح %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "التحضير لتهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "التحضير لإزالة %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "تم إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "تعذرت الكتابة إلى %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ast.po b/po/ast.po index 17daf7a0d..15a485a67 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nun pue alcontrase'l paquete %s" @@ -154,7 +154,7 @@ msgid " Version table:" msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -348,16 +348,16 @@ msgstr "Error internu, l'iguador de problemes frañó coses" msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -366,7 +366,7 @@ msgstr "" "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -378,97 +378,97 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseñar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -477,7 +477,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -486,14 +486,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye " "enforma nuevu" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +502,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,30 +511,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -652,7 +652,7 @@ msgstr "%s yá ta na versión más nueva.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ellí" @@ -745,16 +745,16 @@ msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando entá." msgid "Disk not found." msgstr "Nun s'atopa'l discu." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Nun s'atopa'l ficheru." -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -763,34 +763,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI malu, los URIS llocales nun pueden entamar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Entrando" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nun se pudo determinar el nome del par" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nun se pudo determinar el nome llocal" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "El sirvidor refugó la conexón, y dixo: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "L'usuariu (USER) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "La contraseña (PASS) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -798,121 +798,121 @@ msgstr "" "Especificóse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::" "ProxyLogin ta baleru." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "La triba (TYPE) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Gandió'l tiempu de conexón" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "El sirvidor zarró la conexón" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Fallu de llectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Una rempuesta revirtió'l buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corrupción del protocolu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Fallu d'escritura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nun se pudo crear un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falló" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nun se pudo coneutar un socket pasivu." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nun pudo obtener un zócalu oyente" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nun se pudo enllazar con un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nun se pudo escuchar nel socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nun se pudo determinar el nome del socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nun se pudo mandar la orde PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Direición de familia %u desconocida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló; el sirvidor dixo: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Gandió'l tiempu de conexón col zócalu de datos" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexón" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Gandió'l tiempu del zócalu de datos" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Falló la tresferencia de datos; el sirvidor dixo '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nun se pudo invocar " @@ -978,37 +978,37 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nun pudo coneutase a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Atopóse polo menos una robla mala." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Fallu desconocíu al executar gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1016,35 +1016,35 @@ msgstr "" "Les robles siguientes nun pudieron verificase porque la to llave pública nun " "ta a mano:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" @@ -1080,11 +1080,11 @@ msgstr "Formatu de data desconocíu" msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Fallo la conexón" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Fallu internu" @@ -1334,101 +1334,108 @@ msgstr "¿Instalar esos paquetes ensin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instaláu]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1436,27 +1443,27 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" @@ -1465,7 +1472,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1473,21 +1480,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" @@ -1545,10 +1552,6 @@ msgstr "Fecho" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1664,11 +1667,11 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Conexón encaboxada prematuramente" @@ -1990,31 +1993,38 @@ msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nun pudo allugase memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nun pudo abrise %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Saltu mal formáu %s llinia %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nun pudo lleese'l ficheru de saltos %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Saltu mal formáu %s llinia %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Saltu mal formáu %s llinia %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Saltu mal formáu %s llinia %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nun pudo lleese'l ficheru de saltos %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2042,20 +2052,20 @@ msgstr "Comprimir fíu" msgid "Internal error, failed to create %s" msgstr "Error internu, nun pudo criase %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Fallu na ES al soprocesu/ficheru" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Nun pudo lleese al computar MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema al desenllazar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" @@ -2192,12 +2202,12 @@ msgstr "Doble suma de desvíu %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ficheru de configuración duplicáu %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura nel ficheru %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falló al pesllar el ficheru %s" @@ -2309,7 +2319,7 @@ msgstr "" "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-" "Start. El valor actual ye : %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2317,7 +2327,7 @@ msgid "" msgstr "" "Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2718,7 +2728,7 @@ msgstr "Falló la escritura del ficheru temporal d'estáu %s" msgid "Unable to parse package file %s (1)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" @@ -3244,33 +3254,33 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nun s'alcontró la distribución '%s' pa '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nun s'alcontró la versión '%s' pa '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nun pudo alcontrase la xera '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3279,21 +3289,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3342,12 +3352,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Desinstalando %s" @@ -3368,87 +3378,87 @@ msgid "Running post-installation trigger %s" msgstr "Executando activador de post-instalación de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta'l direutoriu '%s'." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose pa configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instaláu" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose pa desinstalar %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s desinstaláu" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose pa desinstalar dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Desinstalóse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nun se pue escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependencies - déxase ensin configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3456,7 +3466,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que " "siguió dende un fallu previu" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3464,7 +3474,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3472,7 +3482,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "memoria" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3481,7 +3491,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/bg.po b/po/bg.po index 4f7a62959..860ab7e10 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,16 +352,16 @@ msgstr "Вътрешна грешка, „problem resolver“ счупи нещ msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -371,7 +371,7 @@ msgstr "" "адрес:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -383,80 +383,80 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,18 +465,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -659,7 +659,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" @@ -772,16 +772,16 @@ msgstr "Неуспех при демонтирането на CD-ROM в %s, мо msgid "Disk not found." msgstr "Дискът не е намерен." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Файлът не е намерен" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -790,34 +790,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Влизане" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Неуспех при установяването на името на отдалечения сървър" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Неуспех при установяването на локалното име" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сървърът отказа свързване и съобщи: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER се провали, сървърът съобщи: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS се провали, сървърът съобщи: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -825,123 +825,123 @@ msgstr "" "Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::" "ProxyLogin е празен." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE се провали, сървърът съобщи: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Допустимото време за свързването изтече" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Грешка при четене" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Отговорът препълни буфера." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Грешка при запис" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Неуспех при създаването на гнездо" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Неуспех при свързването на гнездо за данни, допустимото време за свързване " "изтече" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Неуспех" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Неуспех при свързването на пасивно гнездо." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo не успя да се добере до слушащо гнездо" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Неуспех при свързването на гнездо" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Неуспех при слушането на гнездото" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Неуспех при определянето на името на гнездото" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Неуспех при изпращането на командата PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестно семейство адреси %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT се провали, сървърът съобщи: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Времето за установяване на връзка с гнездо за данни изтече" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Времето за връзка с гнездо за данни изтече" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Запитване" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Неуспех при извикването на " @@ -1007,40 +1007,40 @@ msgstr "Нещо лошо се случи при намирането на IP а msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързване с %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1048,35 +1048,35 @@ msgstr "" "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " "наличен:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Празни файлове не могат да бъдат валидни архиви" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" @@ -1112,11 +1112,11 @@ msgstr "Неизвестен формат на дата" msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Вътрешна грешка" @@ -1368,101 +1368,108 @@ msgstr "Инсталиране на тези пакети без проверк msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Инсталиран]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " или" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1470,27 +1477,27 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" @@ -1499,7 +1506,7 @@ msgstr "%lu не са напълно инсталирани или премах #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1507,21 +1514,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -1581,10 +1588,6 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1699,11 +1702,11 @@ msgstr "Грешка при четене файла „%s“ от огледал msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" @@ -2027,31 +2030,38 @@ msgstr " %s няма също и запис „binary override“\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Неуспех при заделянето на памет" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Неправилно форматиран override %s, ред %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Неуспех при четенето на override файл %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Неправилно форматиран override %s, ред %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Неправилно форматиран override %s, ред %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Неправилно форматиран override %s, ред %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Неуспех при четенето на override файл %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2079,20 +2089,20 @@ msgstr "Процес-потомък за компресиране" msgid "Internal error, failed to create %s" msgstr "Вътрешна грешка, неуспех при създаването на %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "В/И към подпроцеса/файла пропадна" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Неуспех при четене докато се изчислява MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" @@ -2227,12 +2237,12 @@ msgstr "Двойно добавяне на отклонение %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Дублиран конфигурационен файл %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Неуспех при запис на файл %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" @@ -2344,7 +2354,7 @@ msgstr "" "Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-" "Start. Текуща стойност: %lu (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2353,7 +2363,7 @@ msgstr "" "Неуспех при увеличаване на паметта за MMap. Достигнато е текущото " "ограничение от %lu байта." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2757,7 +2767,7 @@ msgstr "Неуспех при запис на временен StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Неуспех при анализирането на пакетен файл %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" @@ -3298,32 +3308,32 @@ msgstr "Не е намерен oторизационен запис за: %s" msgid "Hash mismatch for: %s" msgstr "Несъответствие на контролната сума за: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Неуспех при намиране на задача „%s“" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3332,21 +3342,21 @@ msgstr "" "Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ " "понеже той няма нито едната" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не е възможно избиране на на последната версия за пакета „%s“, защото е " "виртуален" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма " "подходящ кандидати" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3397,12 +3407,12 @@ msgstr "" msgid "Installing %s" msgstr "Инсталиране на %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Премахване на %s" @@ -3423,89 +3433,89 @@ msgid "Running post-installation trigger %s" msgstr "Изпълнение на тригер след инсталиране %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Директорията „%s“ липсва" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Неуспех при отваряне на файла „%s“" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неуспех при записа на %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Операцията е прекъсната" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Поради достигане на максималния брой доклади (MaxReports) не е записан нов " "доклад за зависимостите." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "отлагане на настройката поради неудовлетворени зависимости" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3513,7 +3523,7 @@ msgstr "" "Доклад за зависимостите не е записан защото съобщението за грешка е породено " "от друга грешка." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3521,7 +3531,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3529,7 +3539,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчна оперативна памет" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3538,7 +3548,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/bs.po b/po/bs.po index af741ea7a..85e507b3a 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -311,23 +311,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -335,151 +335,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -552,7 +552,7 @@ msgstr "" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -645,16 +645,16 @@ msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi." msgid "Disk not found." msgstr "Datoteka nije pronađena" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -663,155 +663,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Prijavljujem se" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Greška pri čitanju" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 #, fuzzy msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Greška pri pisanju" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Neuspješno" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "" @@ -877,71 +877,71 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "" @@ -977,11 +977,11 @@ msgstr "Nepoznat oblik datuma" msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1212,128 +1212,135 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[Instalirano]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ali nije instaliran" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ili" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1342,7 +1349,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1350,21 +1357,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1421,10 +1428,6 @@ msgstr "Urađeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1532,11 +1535,11 @@ msgstr "Ne mogu otvoriti %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "" @@ -1802,29 +1805,36 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:163 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#: ftparchive/override.cc:175 #, c-format -msgid "Failed to read the override file %s" +msgid "Malformed override %s line %llu #2" +msgstr "" + +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" msgstr "" #: ftparchive/multicompress.cc:70 @@ -1854,20 +1864,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1981,12 +1991,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2099,14 +2109,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2503,7 +2513,7 @@ msgstr "Ne mogu ukloniti %s" msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -3001,49 +3011,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3088,12 +3098,12 @@ msgstr "" msgid "Installing %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" @@ -3114,111 +3124,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ne mogu zapisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ca.po b/po/ca.po index 1a7974a9a..f5d32b07a 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -353,16 +353,16 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -384,81 +384,81 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,18 +467,18 @@ msgstr "" "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " "APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +487,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè %s no és permès als " "paquets «%s»" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "La dependència %s per a %s no es pot satisfer perquè la versió candidata del " "paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -663,7 +663,7 @@ msgstr "%s ja estava no retingut.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" @@ -756,16 +756,16 @@ msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." msgid "Disk not found." msgstr "No s'ha trobat el disc" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -774,34 +774,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI no vàlid, els URI locals no han de començar per //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "S'està accedint a" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "No es pot determinar el nom de la màquina distant" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "No es pot determinar el nom local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "El servidor ha rebutjat la nostra connexió i ha dit: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -809,122 +809,122 @@ msgstr "" "S'ha especificat un servidor intermediari però no un script d'accés, " "Acquire::ftp::ProxyLogin està buit." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Temps de connexió finalitzat" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Error de lectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Una resposta ha desbordat la memòria intermèdia." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error d'escriptura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "No s'ha pogut crear un sòcol" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Ha fallat" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "No s'ha pogut connectar amb el sòcol passiu." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte" # abastar? huh? jm -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "No s'ha pogut vincular a un connector" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "No s'ha pogut escoltar sobre el sòcol" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "No s'ha pogut determinar el nom del sòcol" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "No es pot enviar l'ordre PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "La família d'adreces %u és desconeguda (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "S'ha esgotat el temps de connexió al sòcol de dades" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "S'ha esgotat el temps d'espera per al sòcol de dades" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "No es pot invocar" @@ -990,40 +990,40 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar el «gpgv» per a verificar la signatura (està " "instaŀlat el gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1031,36 +1031,36 @@ msgstr "" "Les signatures següents no s'han pogut verificar perquè la clau pública no " "està disponible:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vàlids" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" @@ -1096,11 +1096,11 @@ msgstr "Format de la data desconegut" msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Error intern" @@ -1357,101 +1357,108 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instaŀlat]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1459,27 +1466,27 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" @@ -1488,7 +1495,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1496,21 +1503,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -1568,10 +1575,6 @@ msgstr "Fet" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1686,11 +1689,11 @@ msgstr "No es pot llegir el fitxer rèplica «%s»" msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" @@ -2011,31 +2014,38 @@ msgstr " %s no té una entrada dominant de binari\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - No s'ha pogut assignar espai en memòria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "No es pot obrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Línia predominant %s malformada %llu núm 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Línia predominant %s malformada %llu núm 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Línia predominant %s malformada %llu núm 2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Línia predominant %s malformada %llu núm 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2063,20 +2073,20 @@ msgstr "Comprimeix el fil" msgid "Internal error, failed to create %s" msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" @@ -2211,12 +2221,12 @@ msgstr "Afegit doble d'una desviació %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fitxer de conf. duplicat %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" @@ -2328,7 +2338,7 @@ msgstr "" "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-" "Start. Valor actual: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2337,7 +2347,7 @@ msgstr "" "No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja " "s'ha superat." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2741,7 +2751,7 @@ msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s" msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" @@ -3284,34 +3294,34 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, 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:470 +#: apt-pkg/cacheset.cc:472 #, 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:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "No s'ha pogut trobar la tasca «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3320,21 +3330,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3383,12 +3393,12 @@ msgstr "" msgid "Installing %s" msgstr "S'està instaŀlant %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "S'està suprimint el paquet %s" @@ -3409,87 +3419,87 @@ msgid "Running post-installation trigger %s" msgstr "S'està executant l'activador de postinstaŀlació %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Manca el directori «%s»" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "No s'ha pogut obrir el fitxer «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "S'ha instaŀlat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a la supressió del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "S'ha suprimit el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a suprimir completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No es pot escriure en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "S'ha interromput l'operació abans que pogués finalitzar" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "S'han produït problemes de depències, es deixa sense configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3497,7 +3507,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que és un error " "consequent de una fallida anterior." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3505,7 +3515,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3513,7 +3523,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3522,7 +3532,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/cs.po b/po/cs.po index 90f329cad..2ff4c08fa 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nelze najít balík %s" @@ -155,7 +155,7 @@ msgid " Version table:" msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -344,16 +344,16 @@ msgstr "Vnitřní chyba, řešitel problémů pokazil věci" msgid "Unable to lock the download directory" msgstr "Nelze zamknout adresář pro stahování" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -362,7 +362,7 @@ msgstr "" "INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -373,80 +373,80 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -455,17 +455,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -474,20 +474,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -496,7 +496,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -505,30 +505,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -642,7 +642,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" @@ -754,16 +754,16 @@ msgstr "Nelze odpojit CD-ROM v %s - možná se stále používá." msgid "Disk not found." msgstr "Disk nebyl nalezen." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -772,34 +772,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokální URI nesmí začínat na //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Přihlašuji se" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nelze určit jméno druhé strany" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nelze určit lokální jméno" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Server zamítl naše spojení a řekl: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER selhal, server řekl: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS selhal, server řekl: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -807,121 +807,121 @@ msgstr "" "Byl zadán proxy server, ale ne přihlašovací skript. Acquire::ftp::ProxyLogin " "je prázdný." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE selhal, server řekl: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Čas spojení vypršel" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Chyba čtení" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odpověď přeplnila buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Chyba zápisu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nelze vytvořit socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nelze připojit datový socket, čas spojení vypršel" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Selhalo" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nelze připojit pasivní socket." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal naslouchající socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nelze navázat socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nelze naslouchat na socketu" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nelze určit jméno socketu" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nelze odeslat příkaz PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznámá rodina adres %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT selhal, server řekl: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Spojení datového socketu vypršelo" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nelze přijmout spojení" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problém s kontrolním součtem souboru" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nelze stáhnout soubor, server řekl „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datový socket vypršel" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Přenos dat selhal, server řekl „%s“" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nelze vyvolat " @@ -987,36 +987,36 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - msgid "Unable to connect to %s:%s:" msgstr "Nelze se připojit k %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1024,35 +1024,35 @@ msgstr "" "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný " "klíč:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Prázdné soubory nejsou platnými archivy" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" @@ -1088,11 +1088,11 @@ msgstr "Neznámý formát data" msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Vnitřní chyba" @@ -1346,101 +1346,108 @@ msgstr "Instalovat tyto balíky bez ověření?" msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[Instalovaný]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " nebo" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1448,27 +1455,27 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" @@ -1477,7 +1484,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1485,21 +1492,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -1557,10 +1564,6 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1676,11 +1679,11 @@ msgstr "Nelze číst soubor se zrcadly „%s“" msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" @@ -1994,31 +1997,38 @@ msgstr " %s nemá ani žádnou binární položku pro override\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Selhal pokus o přidělení paměti" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nelze otevřít %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Zkomolený override soubor %s, řádek %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nezdařilo se přečíst override soubor %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Zkomolený override soubor %s, řádek %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Zkomolený override soubor %s, řádek %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Zkomolený override soubor %s, řádek %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nezdařilo se přečíst override soubor %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2046,20 +2056,20 @@ msgstr "Komprimovat potomka" msgid "Internal error, failed to create %s" msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "V/V operace s podprocesem/souborem selhala" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Chyba čtení při výpočtu MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" @@ -2193,12 +2203,12 @@ msgstr "Dvojí přidání diverze %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" @@ -2310,14 +2320,14 @@ msgstr "" "Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. " "Současná hodnota: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2717,7 +2727,7 @@ msgstr "Nelze zapsat dočasný stavový soubor %s" msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" @@ -3240,32 +3250,32 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze „%s“ pro „%s“ nebyla nalezena" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nelze najít úlohu „%s“" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3274,17 +3284,17 @@ msgstr "" "Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože " "žádné takové verze nemá" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, 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" @@ -3331,12 +3341,12 @@ msgstr "" msgid "Installing %s" msgstr "Instaluji %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" @@ -3357,88 +3367,88 @@ msgid "Running post-installation trigger %s" msgstr "Spouštím poinstalační spouštěč %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Adresář „%s“ chybí" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nelze otevřít soubor „%s“" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nelze zapsat do %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operace byla přerušena dříve, než mohla skončit" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problémy se závislostmi - ponechávám nezkonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3446,7 +3456,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "se jedná o chybu způsobenou předchozí chybou." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3454,7 +3464,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3462,7 +3472,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněnou pamětí." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3471,7 +3481,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/cy.po b/po/cy.po index f03fbf0f6..14c656a47 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" @@ -174,7 +174,7 @@ msgid " Version table:" msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -371,23 +371,23 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -395,96 +395,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -493,7 +493,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -502,14 +502,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -518,7 +518,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -527,32 +527,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -666,7 +666,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -763,16 +763,16 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -781,34 +781,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, fuzzy, c-format msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -817,124 +817,124 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1000,72 +1000,72 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:533 +#: methods/http.cc:530 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" @@ -1106,11 +1106,11 @@ msgstr "Fformat dyddiad anhysbys" msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Gwall mewnol" @@ -1359,104 +1359,111 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1466,27 +1473,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1495,7 +1502,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1503,21 +1510,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1576,10 +1583,6 @@ msgstr "Wedi Gorffen" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1690,11 +1693,11 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -2018,31 +2021,38 @@ msgstr " Does dim cofnod gwrthwneud gan %s\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Methwydd darllen y ffeil dargyfeirio %s" - #: ftparchive/multicompress.cc:70 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" @@ -2071,20 +2081,20 @@ msgstr "Plentyn Cywasgu" msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -2224,12 +2234,12 @@ msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -2346,14 +2356,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2762,7 +2772,7 @@ msgstr "Methwyd ysgrifennu ffeil %s" msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -3295,49 +3305,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3385,12 +3395,12 @@ msgstr "" msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" @@ -3411,111 +3421,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/da.po b/po/da.po index 62507db69..ce9926c70 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -356,16 +356,16 @@ msgstr "Intern fejl. Problemløseren ødelagde noget" msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -374,7 +374,7 @@ msgstr "" "BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -385,78 +385,78 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil »%s«\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i »hent-kun«-tilstand" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken »dpkg-dev« er installeret.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +465,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,7 +483,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -491,14 +491,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -507,7 +507,7 @@ msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " "kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -516,30 +516,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -654,7 +654,7 @@ msgstr "%s var allerede ikke i bero.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" @@ -782,16 +782,16 @@ msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -800,34 +800,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI, lokale URI'er må ikke starte med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Logget på" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Kunne ikke bestemme serverens navn" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Kunne ikke bestemme det lokale navn" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serveren nægtede os forbindelse og sagde: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -835,121 +835,121 @@ msgstr "" "Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::" "ProxyLogin er tom." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Logpå-skriptets kommando »%s« mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsudløb på forbindelsen" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Læsefejl" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Mellemlageret blev overfyldt af et svar." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefejl" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Kunne ikke oprette sokkel" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislykkedes" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Kunne ikke forbinde passiv sokkel." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunne ikke få en lyttesokkel" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Kunne ikke tilknytte en sokkel" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Kunne ikke lytte på soklen" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Kunne ikke finde soklens navn" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Kunne ikke sende PORT-kommando" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukendt adressefamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Tidsudløb på datasokkel-forbindelse" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunne ikke hente fil. Serveren sagde »%s«" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Tidsudløb ved datasokkel" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverførsel mislykkedes, serveren sagde »%s«" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Forespørgsel" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Kunne ikke udføre " @@ -1015,23 +1015,23 @@ msgstr "Der skete noget underligt under opløsning af »%s:%s« (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke køre »gpgv« for at verificere signaturen (er gpgv installeret?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1040,15 +1040,15 @@ msgstr "" "Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke " "autentificering?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1056,35 +1056,35 @@ msgstr "" "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er " "tilgængelig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" @@ -1121,11 +1121,11 @@ msgstr "Ukendt datoformat" msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Intern fejl" @@ -1376,98 +1376,105 @@ msgstr "Installér disse pakker uden verifikation?" msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" msgstr "installeret,kan opgraderes til: " -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:202 msgid "[installed,local]" msgstr "[Installeret,lokalt]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 msgid "[installed,automatic]" msgstr "[Installeret,automatisk]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 msgid "[installed]" msgstr "[Installeret]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, fuzzy, c-format +msgid "[upgradable from: %s]" msgstr "[kan opgraderes fra: " -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "[residual-konfig]" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1475,27 +1482,27 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" @@ -1504,7 +1511,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1512,21 +1519,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -1583,10 +1590,6 @@ msgstr "Færdig" msgid "Full Text Search" msgstr "Fuldtekst-søgning" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1701,11 +1704,11 @@ msgstr "Ingen post fundet i spejlfil »%s«" msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" @@ -2026,31 +2029,38 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "realloc - Kunne ikke allokere hukommelse" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Kunne ikke åbne %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Ugyldig gennemtvangs %s-linje %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Kunne ikke læse gennemtvangsfilen %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Ugyldig gennemtvangs %s-linje %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Ugyldig gennemtvangs %s-linje %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Ugyldig gennemtvangs %s-linje %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Kunne ikke læse gennemtvangsfilen %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2078,20 +2088,20 @@ msgstr "Komprimer barn" msgid "Internal error, failed to create %s" msgstr "Intern fejl. Kunne ikke oprette %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO til underproces/fil mislykkedes" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Kunne ikke læse under beregning af MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem under aflænkning af %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" @@ -2226,12 +2236,12 @@ msgstr "Dobbelt tilføjelse af omrokering %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opsætningsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" @@ -2343,7 +2353,7 @@ msgstr "" "Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. " "Aktuel værdi: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2352,7 +2362,7 @@ msgstr "" "Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er " "nået." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2749,7 +2759,7 @@ msgstr "Kunne ikke skrive den midlertidige StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" @@ -3275,32 +3285,32 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsum stemmer ikke: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunne ikke finde opgaven »%s«" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3309,18 +3319,18 @@ msgstr "" "Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke " "har nogen af dem" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3368,12 +3378,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Sætter %s op" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Fjerner %s" @@ -3394,88 +3404,88 @@ msgid "Running post-installation trigger %s" msgstr "Kører førinstallationsudløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Mappe »%s« mangler" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Kunne ikke åbne filen »%s«" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Klargør %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Gør klar til at sætte %s op" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Gør klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Gør klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive log (%s)" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "Er /dev/pts monteret?" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "Er standardud en terminal?" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Handling blev afbrudt før den kunne afsluttes" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3483,14 +3493,14 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en " "opfølgningsfejl fra en tidligere fejl." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3498,7 +3508,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3506,7 +3516,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale " "system" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl" diff --git a/po/de.po b/po/de.po index 190e7d012..718a8c300 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Paket %s kann nicht gefunden werden." @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -359,18 +359,18 @@ msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt." msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen." -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -380,7 +380,7 @@ msgstr "" "auf:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -392,80 +392,80 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -474,18 +474,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +494,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen " "nicht erlaubt ist." -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +503,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " "ist zu neu." -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -520,7 +520,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -529,30 +529,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -675,7 +675,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" @@ -791,17 +791,17 @@ msgstr "" msgid "Disk not found." msgstr "Medium nicht gefunden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -810,34 +810,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen." #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Anmeldung läuft" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Name des Kommunikationspartners kann nicht bestimmt werden." -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Lokaler Name kann nicht bestimmt werden." -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Verbindung durch Server abgelehnt; Server meldet: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Befehl USER fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -845,123 +845,123 @@ msgstr "" "Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::" "ProxyLogin ist leer." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Befehl TYPE fehlgeschlagen: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Zeitüberschreitung der Verbindung" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lesefehler" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Schreibfehler" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Socket konnte nicht erzeugt werden." -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden." -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Fehlgeschlagen" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Passiver Socket konnte nicht verbunden werden." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket " "gefunden." -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Verbindung des Sockets nicht möglich" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Warten auf Verbindungen auf dem Socket nicht möglich" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Name des Sockets konnte nicht bestimmt werden." -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT-Befehl konnte nicht gesendet werden." -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Unbekannte Adressfamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Befehl EPRT fehlgeschlagen: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden." -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem bei Bestimmung des Hashwertes einer Datei" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Zeitüberschreitung bei Datenverbindung" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Abfrage" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Aufruf nicht möglich: " @@ -1029,40 +1029,40 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)." msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " "jedoch nicht ermittelt werden?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv " "installiert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1071,37 +1071,37 @@ msgstr "" "öffentlicher\n" "Schlüssel nicht verfügbar ist:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gültiges Archiv sein." -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen." -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" @@ -1140,11 +1140,11 @@ msgstr "Unbekanntes Datumsformat" msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Interner Fehler" @@ -1401,102 +1401,109 @@ msgstr "Diese Pakete ohne Überprüfung installieren?" msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installiert]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installiert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installiert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installiert]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " oder" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1504,27 +1511,27 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" @@ -1533,7 +1540,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1541,21 +1548,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -1613,10 +1620,6 @@ msgstr "Fertig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1732,12 +1735,12 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" @@ -2065,31 +2068,38 @@ msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Speicheranforderung fehlgeschlagen" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s konnte nicht geöffnet werden." -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Missgestaltetes Override %s Zeile %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Override-Datei %s konnte nicht gelesen werden." + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Missgestaltetes Override %s Zeile %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Missgestaltetes Override %s Zeile %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Missgestaltetes Override %s Zeile %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Override-Datei %s konnte nicht gelesen werden." - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2117,20 +2127,20 @@ msgstr "Komprimierungs-Kindprozess" msgid "Internal error, failed to create %s" msgstr "Interner Fehler, %s konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem beim Entfernen (unlink) von %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s konnte nicht in %s umbenannt werden." @@ -2266,12 +2276,12 @@ msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Datei %s konnte nicht geschrieben werden." -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Datei %s konnte nicht geschlossen werden." @@ -2383,7 +2393,7 @@ msgstr "" "Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::" "Cache-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2392,7 +2402,7 @@ msgstr "" "Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits " "erreicht ist." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2802,7 +2812,7 @@ msgstr "Temporäres StateFile %s konnte nicht geschrieben werden." msgid "Unable to parse package file %s (1)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." @@ -3353,34 +3363,34 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, 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:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Task »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3389,21 +3399,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3453,12 +3463,12 @@ msgstr "" msgid "Installing %s" msgstr "%s wird installiert." -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s wird konfiguriert." -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s wird entfernt." @@ -3479,89 +3489,89 @@ msgid "Running post-installation trigger %s" msgstr "Aufruf des Nach-Installations-Triggers %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Verzeichnis »%s« fehlt" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Datei »%s« konnte nicht geöffnet werden." -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt." -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Vollständiges Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s vollständig entfernt" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Schreiben nach %s nicht möglich" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " "erreicht ist." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3569,7 +3579,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf " "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3577,7 +3587,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3585,7 +3595,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen erschöpftem Arbeitsspeicher hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3594,7 +3604,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/dz.po b/po/dz.po index db2efb4d8..ec6a7aaea 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -356,23 +356,23 @@ msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མ msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -380,116 +380,116 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -498,37 +498,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -644,7 +644,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" @@ -738,16 +738,16 @@ msgstr "" msgid "Disk not found." msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -756,34 +756,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་ ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་ཁར་འགོ་བཙུགས་ནི་མི་འོང་།" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "ནང་བསྐྱོད་འབད་དོ།" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "དོ་བཉམ་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "ཉེ་གནས་མིང་འདི་གཏན་འབེེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "སར་བར་འདི་གིས་ མཐུད་ལམ་འདི་ངོས་ལེན་འབད་མ་བཏུབ་པར་སླབ་མས: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "ལག་ལེན་པ་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "རྩི་སྤྲོད་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -791,121 +791,121 @@ msgstr "" "པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདཝ་ད་ ནང་བསྐྱོད་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::" "ProxyLoginའདི་སྟོངམ་ཨིན་པས།" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འཐོས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "མཐུད་ལམ་ངལ་མཚམས" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གིས་སླབ་མས:%s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་'%s'་གིས་སླབ་མས།" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "འདྲི་དཔྱད།" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" @@ -971,75 +971,75 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་ msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" @@ -1075,11 +1075,11 @@ msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -1326,101 +1326,108 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "ཡང་ན།" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1428,27 +1435,27 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" @@ -1457,7 +1464,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1465,21 +1472,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "ཝའི།" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -1537,10 +1544,6 @@ msgstr "འབད་ཚར་ཡི།" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1651,11 +1654,11 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" @@ -1981,31 +1984,38 @@ msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནི msgid "realloc - Failed to allocate memory" msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2033,20 +2043,20 @@ msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" msgid "Internal error, failed to create %s" msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2183,12 +2193,12 @@ msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ msgid "Duplicate conf file %s/%s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2301,14 +2311,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2706,7 +2716,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལ msgid "Unable to parse package file %s (1)" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" @@ -3223,49 +3233,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3313,12 +3323,12 @@ msgstr "" msgid "Installing %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" @@ -3339,111 +3349,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/el.po b/po/el.po index 08c593d5c..9f99d4de3 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" @@ -167,7 +167,7 @@ msgid " Version table:" msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -364,25 +364,25 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -390,96 +390,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -488,7 +488,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -656,7 +656,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" @@ -749,16 +749,16 @@ msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μ msgid "Disk not found." msgstr "Ο δίσκος δεν βρέθηκε." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -767,34 +767,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Μη έγκυρο URI, τα τοπικά URI δεν πρέπει να αρχίζουν με //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Σύνδεση στο σύστημα" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Αδύνατος ο καθορισμός του ονόματος του ομότιμου (peer)" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Αδύνατος ο καθορισμός του τοπικού ονόματος" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Ο διακομιστής αρνήθηκε την σύνδεση με μήνυμα: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Η εντολή USER απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Η εντολή PASS απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -802,121 +802,121 @@ msgstr "" "Ο διαμεσολαβητής έχει οριστεί αλλά χωρίς σενάριο εισόδου, το Acquire::ftp::" "ProxyLogin είναι άδειο" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Το μήνυμα απάντησης υπερχείλισε την ενδιάμεση μνήμη." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Σφάλμα εγγραφής" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Απέτυχε" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Αδύνατη η αποστολή της εντολής PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Λήξη χρόνου υποδοχής δεδομένων" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Επερώτηση" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" @@ -982,18 +982,18 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" @@ -1001,22 +1001,22 @@ msgstr "" "εγκατεστημένο το gpgv;)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1024,36 +1024,36 @@ msgstr "" "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " "διαθέσιμο το δημόσιο κλειδί:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" @@ -1089,11 +1089,11 @@ msgstr "Άγνωστη μορφή ημερομηνίας" msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -1344,101 +1344,108 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Εγκατεστημένα]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " η" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1446,27 +1453,27 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" @@ -1475,7 +1482,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Ν/ο]" @@ -1483,21 +1490,21 @@ msgstr "[Ν/ο]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[ν/Ο]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -1557,10 +1564,6 @@ msgstr "Ετοιμο" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1671,11 +1674,11 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" @@ -2001,31 +2004,38 @@ msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκ msgid "realloc - Failed to allocate memory" msgstr "realoc - Αδυναμία εκχώρησης μνήμης" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Αδύνατο το άνοιγμα του %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2053,20 +2063,20 @@ msgstr "Συμπίεση απογόνου" msgid "Internal error, failed to create %s" msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" @@ -2202,12 +2212,12 @@ msgstr "Διπλή προσθήκη εκτροπής %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" @@ -2320,14 +2330,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2729,7 +2739,7 @@ msgstr "Αποτυχία εγγραφής του αρχείου κατάστασ msgid "Unable to parse package file %s (1)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" @@ -3252,49 +3262,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3342,12 +3352,12 @@ msgstr "" msgid "Installing %s" msgstr "Εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" @@ -3368,111 +3378,111 @@ msgid "Running post-installation trigger %s" msgstr "Εκτέλεση του post-installation trigger %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Ο φάκελος %s αγνοείται." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Έγινε εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Αδύνατη η εγγραφή στο %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/es.po b/po/es.po index 17b0f3a49..9e33aaf2c 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" @@ -212,7 +212,7 @@ msgid " Version table:" msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -411,16 +411,16 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -430,7 +430,7 @@ msgstr "" "versiones «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -442,97 +442,97 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus dependencias de " "construcción" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -541,7 +541,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -550,14 +550,14 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -566,7 +566,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión " "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -575,30 +575,30 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando a %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -716,7 +716,7 @@ msgstr "%s ya está en su versión más reciente.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba allí" @@ -809,16 +809,16 @@ msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso." msgid "Disk not found." msgstr "Disco no encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -827,34 +827,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, los URIS locales no deben de empezar con //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Entrando" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "No pude determinar el nombre del par" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Imposible determinar el nombre local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "El servidor rechazó nuestra conexión y dijo: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Usuario (USER) falló, el servidor dijo: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Clave (PASS) falló, el servidor dijo: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -862,121 +862,121 @@ msgstr "" "Se especificó un servidor proxy pero no un script de entrada, «Acquire::ftp::" "ProxyLogin» está vacío." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Falló la orden «%s» del script de entrada, el servidor dijo: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Tipo (TYPE) falló, el servidor dijo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "La conexión expiró" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "El servidor cerró la conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Error de lectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "No pude crear un socket." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Fallo del protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error de escritura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "No pude crear un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falló" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "No pude conectar un socket pasivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo no pude obtener un socket oyente" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "No pude ligar un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "No pude escuchar en el socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "No pude determinar el nombre del socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "No pude mandar la orden PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Dirección de familia %u desconocida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló, el servidor dijo: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Expiró conexión a socket de datos" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Se produjo un problema al hacer un hash del archivo" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Imposible traer archivo, el servidor dijo «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Expiró el socket de datos" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Falló transferencia de datos, el servidor dijo «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "No pude invocar " @@ -1042,39 +1042,39 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No se pudo conectar a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, ¡¿pero no se pudo determinar su huella " "digital?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1082,35 +1082,35 @@ msgstr "" "Las firmas siguientes no se pudieron verificar porque su llave pública no " "está disponible:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" @@ -1146,11 +1146,11 @@ msgstr "Formato de fecha desconocido" msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Error interno" @@ -1408,101 +1408,108 @@ msgstr "¿Instalar estos paquetes sin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "pero no es instalable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "pero no está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1510,27 +1517,27 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" @@ -1539,7 +1546,7 @@ msgstr "%lu no instalados del todo o eliminados.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1547,21 +1554,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -1619,10 +1626,6 @@ msgstr "Listo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1737,11 +1740,11 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "[Mirror: %s]" msgstr "[Réplica: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "La conexión se cerró prematuramente" @@ -2068,31 +2071,38 @@ msgstr " %s tampoco tiene una entrada binaria predominante\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - No pudo reservar memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Predominio mal formado %s línea %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "No se pudo leer el archivo de predominio %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Predominio mal formado %s línea %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Predominio mal formado %s línea %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Predominio mal formado %s línea %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "No se pudo leer el archivo de predominio %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2120,20 +2130,20 @@ msgstr "Hijo compresión" msgid "Internal error, failed to create %s" msgstr "Error interno, no se pudo crear %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Falló la ES a subproceso/archivo" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "No se pudo leer mientras se computaba MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Se produjo un problema al desligar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" @@ -2271,12 +2281,12 @@ msgstr "Doble suma de desviación %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuración duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura del archivo %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" @@ -2388,7 +2398,7 @@ msgstr "" "La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el " "valor de «APT::Cache-Start». El valor actual es: %lu (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2397,7 +2407,7 @@ msgstr "" "No se pudo incrementar el tamaño del MMap dado que se ha alcanzado ya el " "límite de %lu bytes." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2801,7 +2811,7 @@ msgstr "Falló la escritura del fichero de estado temporal %s" msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" @@ -3342,34 +3352,34 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución «%s» para «%s»" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión «%s» para «%s»" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "No se pudo encontrar la tarea «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3378,21 +3388,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3442,12 +3452,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Eliminando %s" @@ -3468,89 +3478,89 @@ msgid "Running post-installation trigger %s" msgstr "Ejecutando disparador post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta el directorio «%s»." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Se borró completamente %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No se puede escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de " "«MaxReports»" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - dejando sin instalar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3558,7 +3568,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que es " "un mensaje de error asociado a un fallo previo." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3566,7 +3576,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3574,7 +3584,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica un " "error de memoria excedida" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3583,7 +3593,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/eu.po b/po/eu.po index 9f1fb15e8..8619b0b96 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,23 +352,23 @@ msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -376,97 +376,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -474,7 +474,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -482,14 +482,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -498,7 +498,7 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -506,30 +506,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -643,7 +643,7 @@ msgstr "%s bertsiorik berriena da jada.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" @@ -737,16 +737,16 @@ msgstr "" msgid "Disk not found." msgstr "Ez da diska aurkitu" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -755,34 +755,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Sartzen" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ezin izan da peer edo parekoaren izena zehaztu" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Ezin izan da izen lokala zehaztu" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -790,124 +790,124 @@ msgstr "" "Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::" "ProxyLogin hutsik dago." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan " "du: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Konexioa denboraz kanpo" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Irakurketa errorea" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Erantzun batek bufferrari gainez eragin dio." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Idazketa errorea" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Ezin izan da socket-a sortu" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Huts egin du" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Ezin izan da socket pasibora konektatu." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Ezin izan da socket bat lotu" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Ezin izan da socket-ean entzun" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Ezin izan da socket-aren izena zehaztu" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Ezin da PORT komandoa bidali" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Helbide familia ezezagunaa: %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Datu-socket konexioak denbora muga gainditu du" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datu-socketak denbora muga gainditu du" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Kontsulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Ezin da deitu " @@ -974,37 +974,37 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1012,35 +1012,35 @@ msgstr "" "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " "eskuragarri:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" @@ -1076,11 +1076,11 @@ msgstr "Datu formatu ezezaguna" msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Barne errorea" @@ -1334,101 +1334,108 @@ msgstr "Paketeak egiaztapen gabe instalatu?" msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalatuta]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " edo" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1436,27 +1443,27 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" @@ -1465,7 +1472,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[B/e]" @@ -1473,21 +1480,21 @@ msgstr "[B/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[b/E]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -1545,10 +1552,6 @@ msgstr "Eginda" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1659,11 +1662,11 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" @@ -1982,31 +1985,38 @@ msgstr " %s: ez du bitar gainidazketa sarrerarik\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Huts egin du memoria esleitzean" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Ezin da %s ireki" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gaizki osatutako override %s, lerroa: %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Huts egin du %s override fitxategia irakurtzean" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gaizki osatutako override %s, lerroa: %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Huts egin du %s override fitxategia irakurtzean" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2034,20 +2044,20 @@ msgstr "Konprimatu Umeak" msgid "Internal error, failed to create %s" msgstr "Barne Errorea, Huts %s sortzerakoan" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Huts egin du MD5 konputatzean" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" @@ -2182,12 +2192,12 @@ msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" @@ -2301,14 +2311,14 @@ msgstr "" "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko " "balioa: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2708,7 +2718,7 @@ msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi" msgid "Unable to parse package file %s (1)" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" @@ -3222,49 +3232,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, 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:470 +#: apt-pkg/cacheset.cc:472 #, 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:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ezin izan da %s zeregina aurkitu" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3312,12 +3322,12 @@ msgstr "" msgid "Installing %s" msgstr "%s Instalatzen" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s kentzen" @@ -3338,111 +3348,111 @@ msgid "Running post-installation trigger %s" msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "'%s' direktorioa falta da" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s : ezin da idatzi" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/fi.po b/po/fi.po index e352a20a4..c0efe6487 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -349,23 +349,23 @@ msgstr "Sisäinen virhe, resolver rikkoi jotain" msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -373,96 +373,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -470,7 +470,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -478,14 +478,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -494,7 +494,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -502,30 +502,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -638,7 +638,7 @@ msgstr "%s on jo uusin versio.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" @@ -731,16 +731,16 @@ msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." msgid "Disk not found." msgstr "Levyä ei löydy" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -749,34 +749,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Kirjaudutaan sisään" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Vastapään nimeä ei saa selville" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Paikallista nimeä ei saa selville" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Palvelin ei huolinut yhteyttä ilmoituksella: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER ei onnistunut, palvelimen ilmoitus: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ei onnistunut, palvelimen ilmoitus: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -784,121 +784,121 @@ msgstr "" "Määritettiin välipalvelin mutta ei komentotiedostoa kirjautumiseen, Acquire::" "ftp::ProxyLogin on tyhjä." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Yhteys aikakatkaistiin" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lukuvirhe" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Vastaus aiheutti puskurin ylivuodon." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Virhe kirjoitettaessa" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Pistoketta ei voitu luoda" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Ei onnistunut" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Passiivista pistoketta ei voitu kytkeä." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ei saanut kuuntelupistoketta" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Pistoketta ei voitu nimetä" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Pistoketta ei voitu kuunnella" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Pistokkeen nimeä ei saatu selville" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Komennon PORT lähetys ei onnistu" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Tuntematon osoiteperhe %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Pistokkeen kytkeminen aikakatkaistiin" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\"" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Pistoke aikakatkaistiin" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\"" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Kysely" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" @@ -964,39 +964,39 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" msgid "Unable to connect to %s:%s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1004,35 +1004,35 @@ msgstr "" "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole " "saatavilla:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" @@ -1068,11 +1068,11 @@ msgstr "Tuntematon päiväysmuoto" msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Sisäinen virhe" @@ -1326,101 +1326,108 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?" msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Asennettu]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " tai" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1428,27 +1435,27 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" @@ -1457,7 +1464,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[K/e]" @@ -1465,21 +1472,21 @@ msgstr "[K/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "K" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -1537,10 +1544,6 @@ msgstr "Valmis" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1651,11 +1654,11 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" @@ -1979,31 +1982,38 @@ msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Muistin varaaminen ei onnistunut" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2031,20 +2041,20 @@ msgstr "Compress-lapsiprosessi" msgid "Internal error, failed to create %s" msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" @@ -2179,12 +2189,12 @@ msgstr "Korvautuksen kaksoislisäys %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" @@ -2296,14 +2306,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2699,7 +2709,7 @@ msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut" msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" @@ -3214,49 +3224,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Kohteen %s tarkistussumma ei täsmää" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Tehtävää %s ei löytynyt" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Pakettia %s ei löytynyt" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3304,12 +3314,12 @@ msgstr "" msgid "Installing %s" msgstr "Asennetaan %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" @@ -3330,111 +3340,111 @@ msgid "Running post-installation trigger %s" msgstr "Suoritetaan jälkiasennusliipaisin %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Kansio \"%s\" puuttuu." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/fr.po b/po/fr.po index 532af8d91..6740d57e9 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " Table de version :" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -367,16 +367,16 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -386,7 +386,7 @@ msgstr "" "suivi de versions « %s » à l'adresse :\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -398,80 +398,80 @@ msgstr "" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -481,17 +481,17 @@ msgstr "" "consulter la section à propos de APT::Architectures dans la page de manuel " "apt.conf(5)." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -500,7 +500,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " "autorisé avec les paquets « %s »." -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -509,14 +509,14 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -525,7 +525,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "disponible du paquet %s ne peut satisfaire les prérequis de version." -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -534,31 +534,31 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s " "n'a pas de version disponible." -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -675,7 +675,7 @@ msgstr "%s était déjà marqué comme non figé.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" @@ -795,16 +795,16 @@ msgstr "" msgid "Disk not found." msgstr "Disque non trouvé." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fichier non trouvé" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -813,34 +813,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Connexion en cours" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Impossible de déterminer le nom de la machine distante" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Impossible de déterminer le nom local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Le serveur a refusé notre connexion et a répondu : %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -848,123 +848,123 @@ msgstr "" "Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::" "ftp::ProxyLogin est vide." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Échec de TYPE, le serveur a répondu : %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Dépassement du délai de connexion" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Erreur de lecture" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Une réponse a fait déborder le tampon." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erreur d'écriture" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Impossible de créer un connecteur" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Impossible de se connecter sur le port de données, délai de connexion dépassé" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Échec" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Impossible de se connecter au port en mode passif." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo n'a pu obtenir un port d'écoute" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Impossible de se connecter à un port" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Impossible d'écouter sur le port" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Impossible de déterminer le nom du port" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Impossible d'envoyer la commande PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famille d'adresses %u inconnue (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Délai de connexion au port de données dépassé" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Pas de réponse du port données dans les délais" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Le transfert de données a échoué, le serveur a répondu « %s »" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Requête" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Impossible d'invoquer " @@ -1032,25 +1032,25 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez " "vérifier si gpgv est installé)." #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1059,15 +1059,15 @@ msgstr "" "Le fichier signé en clair n'est pas valable, ce qui a été reçu est « %s ». " "Peut-être le réseau nécessite-t-il une authentification." -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1075,35 +1075,35 @@ msgstr "" "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " "n'est pas disponible :\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" @@ -1139,11 +1139,11 @@ msgstr "Format de date inconnu" msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Erreur interne" @@ -1409,101 +1409,108 @@ msgstr "Faut-il installer ces paquets sans vérification ?" msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installé]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installé]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installé]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installé]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1512,27 +1519,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" @@ -1541,7 +1548,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[O/n]" @@ -1549,21 +1556,21 @@ msgstr "[O/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[o/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -1621,10 +1628,6 @@ msgstr "Fait" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1741,11 +1744,11 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." msgid "[Mirror: %s]" msgstr "[Miroir : %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de créer le tube IPC sur le sous-processus" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" @@ -2070,31 +2073,38 @@ msgstr " %s ne possède pas également pas d'entrée « binary override »\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Échec de l'allocation de mémoire" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Entrée « override » %s mal formée ligne %llu n° 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Impossible de lire le fichier d'« override » %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Entrée « override » %s mal formée ligne %llu n° 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Entrée « override » %s mal formée %llu n° 2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Entrée « override » %s mal formée %llu n° 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Impossible de lire le fichier d'« override » %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2122,20 +2132,20 @@ msgstr "Fils compressé" msgid "Internal error, failed to create %s" msgstr "Erreur interne, impossible de créer %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Impossible de lire lors du calcul de la somme MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problème en déliant %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" @@ -2273,12 +2283,12 @@ msgstr "Addition double d'une déviation %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fichier de configuration en double %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Erreur d'écriture du fichier %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Échec de clôture du fichier %s" @@ -2391,7 +2401,7 @@ msgstr "" "Vous devriez augmenter la taille de APT::Cache-Start, dont la valeur " "actuelle est de %lu (voir « man 5 apt.conf »)." -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2400,7 +2410,7 @@ msgstr "" "Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets " "est déjà atteinte." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2809,7 +2819,7 @@ msgstr "Erreur d'écriture du fichier d'état temporaire %s" msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" @@ -3375,36 +3385,36 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, 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:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossible de trouver la tâche « %s »" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3413,20 +3423,20 @@ msgstr "" "Impossible de choisir une version installée ou candidate du paquet « %s » " "qui n'en n'a aucune" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3475,12 +3485,12 @@ msgstr "" msgid "Installing %s" msgstr "Installation de %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Suppression de %s" @@ -3501,87 +3511,87 @@ msgid "Running post-installation trigger %s" msgstr "Exécution des actions différées (« trigger ») de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Répertoire %s inexistant" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Impossible d'ouvrir le fichier « %s »" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossible d'écrire sur %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3589,14 +3599,14 @@ msgstr "" "Aucun rapport « apport » n'a été créé car le message d'erreur indique une " "erreur consécutive à un échec précédent." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3604,7 +3614,7 @@ msgstr "" "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3612,7 +3622,7 @@ msgid "" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/gl.po b/po/gl.po index c51f5a027..fc10b5552 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Non foi posíbel atopar o paquete %s" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -355,16 +355,16 @@ msgstr "Produciuse un erro interno, o solucionador interno estragou cousas" msgid "Unable to lock the download directory" msgstr "Non é posíbel bloquear o directorio de descargas" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -373,7 +373,7 @@ msgstr "" "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -385,97 +385,97 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ten que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar polo menos un paquete para comprobarlle as dependencias " "de compilación" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non é posíbel obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,7 +484,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -493,14 +493,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s " "é novo de máis" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -509,7 +509,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión " "dispoñíbel do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -518,30 +518,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de construción de %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -661,7 +661,7 @@ msgstr "%s xa é a versión máis recente.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" @@ -754,16 +754,16 @@ msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda msgid "Disk not found." msgstr "Non se atopou o disco" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -772,34 +772,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI incorrecto, os URI locais non deben comezar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Identificándose" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Non é posíbel determinar o nome do outro extremo" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Non é posíbel determinar o nome local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor rexeitou a conexión e dixo: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Fallou a orde USER, o servidor dixo: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Fallou a orde PASS, o servidor dixo: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -807,122 +807,122 @@ msgstr "" "Especificouse un servidor proxy pero non un script de conexión, Acquire::" "ftp::ProxyLogin está baleiro." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Fallou a orde TYPE, o servidor dixo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Esgotouse o tempo para a conexión" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Produciuse un erro de lectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Unha resposta desbordou o búfer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Dano no protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Produciuse un erro de escritura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Non é posíbel crear un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Fallou" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Non é posíbel conectar o socket pasivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo non puido obter un socket no que atender" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Non é posíbel ligar un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Non é posíbel escoitar no socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Non é posíbel determinar o nome do socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Non é posíbel enviar a orde PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familia de enderezos %u (AF_*) descoñecida" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "A conexión do socket de datos esgotou o tempo" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Non é posíbel aceptar a conexión" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Xurdiu un problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "O socket de datos esgotou o tempo" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Petición" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Non é posíbel chamar a " @@ -988,40 +988,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Non é posíbel conectar %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Atopouse polo menos unha sinatura incorrecta." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Produciuse un erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran correctas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1029,36 +1029,36 @@ msgstr "" "Non se puideron verificar as seguintes sinaturas porque a chave pública non " "está dispoñíbel:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores válidos" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Produciuse un erro ao escribir no ficheiro" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Produciuse un erro ao ler do servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Produciuse un erro ao escribir nun ficheiro" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Produciuse un erro ao escribir no ficheiro de saída" @@ -1095,11 +1095,11 @@ msgstr "Formato de datos descoñecido" msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Produciuse un fallo na conexión" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Produciuse un erro interno" @@ -1358,101 +1358,108 @@ msgstr "Instalar estes paquetes sen verificación?" msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mais non é instalábel" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mais non está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1460,27 +1467,27 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" @@ -1489,7 +1496,7 @@ msgstr "%lu non instalados ou retirados de todo.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1497,21 +1504,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" @@ -1569,10 +1576,6 @@ msgstr "Feito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1688,11 +1691,11 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»" msgid "[Mirror: %s]" msgstr "[Replica: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" @@ -2014,31 +2017,38 @@ msgstr " %s tampouco ten unha entrada de «override» de binarios\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Non foi posíbel reservar memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Non é posíbel puido abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "«Override» %s liña %lu incorrecta (1)" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Non foi posíbel ler o ficheiro de «override» %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "«Override» %s liña %lu incorrecta (1)" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "«Override» %s liña %lu incorrecta (2)" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "«Override» %s liña %lu incorrecta (3)" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Non foi posíbel ler o ficheiro de «override» %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2066,20 +2076,20 @@ msgstr "Fillo de compresión" msgid "Internal error, failed to create %s" msgstr "Produciuse un erro interno, non foi posíbel crear %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Produciuse un fallo na E/S do subproceso/ficheiro" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Non foi posíbel ler ao calcular o MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Xurdiu un problema ao desligar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Non foi posíbel cambiar o nome de %s a %s" @@ -2216,12 +2226,12 @@ msgstr "Desvío %s -> %s engadido dúas veces" msgid "Duplicate conf file %s/%s" msgstr "Ficheiro de configuración %s/%s duplicado" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Non foi posíbel escribir no ficheiro «%s»" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Non foi posíbel pechar o ficheiro %s" @@ -2333,7 +2343,7 @@ msgstr "" "Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-" "Start. O valor actual é : %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2342,7 +2352,7 @@ msgstr "" "Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi " "acadado." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2748,7 +2758,7 @@ msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s" msgid "Unable to parse package file %s (1)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" @@ -3284,34 +3294,34 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a publicación «%s» de «%s»" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión «%s» de «%s»" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Non foi posíbel atopar a tarefa «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3320,21 +3330,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3384,12 +3394,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Retirando %s" @@ -3410,89 +3420,89 @@ msgid "Running post-installation trigger %s" msgstr "Executando o disparador de post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directorio «%s»" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparandose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para o retirado de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Retirouse %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para retirar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Retirouse %s completamente" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Non é posíbel escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Non se escribiu ningún informe de Apport porque xa se acadou o nivel " "MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - déixase sen configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3500,7 +3510,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que " "é un error provinte dun fallo anterior." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3508,7 +3518,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3516,7 +3526,7 @@ msgstr "" "Non se escribiu un informe de contribución porque a mensaxe de erro indica " "un erro de falta de memoria" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3525,7 +3535,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/hu.po b/po/hu.po index 86bde5cee..da083b8c7 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ez a csomag nem található: %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -351,17 +351,17 @@ msgstr "Belső hiba, a problémamegoldó hibát okozott" msgid "Unable to lock the download directory" msgstr "Nem lehet zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -371,7 +371,7 @@ msgstr "" "karbantartva:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -382,80 +382,80 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött „%s” fájl kihagyása\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a „csak letöltés” módban" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -464,17 +464,17 @@ msgstr "" "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal " "kapcsolatban lásd az apt.conf(5) APT::Architectures részét." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási függőségeinek információit letölteni" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,7 +483,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem " "engedélyezett a(z) „%4$s” csomagokon" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -492,14 +492,14 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem " "található" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl " "friss" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -508,7 +508,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető " "verziója nem elégíti ki a verziókövetelményeket" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -517,30 +517,30 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs " "jelölt verziója" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetők ki." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -656,7 +656,7 @@ msgstr "%s eddig sem volt visszafogva.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Nem található a(z) %s, a várakozás után sem" @@ -771,16 +771,16 @@ msgstr "" msgid "Disk not found." msgstr "A lemez nem található." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "A fájl nem található" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -789,34 +789,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Érvénytelen URI, helyi URI-k nem kezdődhetnek //-rel" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Bejelentkezés" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nem lehet a partner nevét megállapítani" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nem lehet a helyi nevet megállapítani" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "A kiszolgáló visszautasította a kapcsolatot: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Hibás USER, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Hibás PASS, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -824,124 +824,124 @@ msgstr "" "Meg lett adva proxy kiszolgáló, de nincs bejelentkezési parancsfájl és az " "Acquire::ftp::ProxyLogin üres." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "A bejelentkezési parancsfájl „%s” parancsa sikertelen, a kiszolgáló üzenete: " "%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Hibás TYPE, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Időtúllépés a kapcsolatban" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Olvasási hiba" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "A válasz túlcsordította a puffert." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollhiba" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Írási hiba" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nem lehet létrehozni a foglalatot" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Sikertelen" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nem lehet kapcsolódni a passzív foglalathoz." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "A getaddrinfo nem talált figyelőfoglalatot" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nem lehet összekapcsolódni a foglalattal" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nem lehet figyelni a foglalaton" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nem lehet megállapítani a foglalat nevét" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nem lehet PORT parancsot küldeni" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ismeretlen címcsalád: %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Hibás EPRT, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Az adatfoglalat túllépte az időkorlátot" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Az adatátvitel sikertelen, a kiszolgáló üzenete: „%s”" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Lekérdezés" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nem lehet meghívni " @@ -1007,37 +1007,37 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nem lehet csatlakozni ehhez: %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata." -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Legalább egy aláírás érvénytelen." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1045,35 +1045,35 @@ msgstr "" "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető " "el:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Az üres fájlok biztosan nem érvényes csomagok" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "A kiválasztás sikertelen" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" @@ -1109,11 +1109,11 @@ msgstr "Ismeretlen dátumformátum" msgid "Bad header data" msgstr "Rossz fejlécadatok" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Belső hiba" @@ -1364,101 +1364,108 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Telepítve]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " vagy" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1466,27 +1473,27 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" @@ -1495,7 +1502,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[I/n]" @@ -1503,21 +1510,21 @@ msgstr "[I/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[i/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -1575,10 +1582,6 @@ msgstr "Kész" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1693,11 +1696,11 @@ msgstr "A(z) „%s” tükörfájl nem olvasható" msgid "[Mirror: %s]" msgstr "[Tükör: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" @@ -2017,31 +2020,38 @@ msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nem sikerült memóriát lefoglalni" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "%s felülbírálás deformált a(z) %llu. sorában #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2069,20 +2079,20 @@ msgstr "Gyermekfolyamat tömörítése" msgid "Internal error, failed to create %s" msgstr "Belső hiba, %s létrehozása sikertelen" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Olvasási hiba az MD5 kiszámításakor" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Hiba %s törlésekor" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "„%s” átnevezése sikertelen erre: %s" @@ -2218,12 +2228,12 @@ msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "A(z) %s fájl írása sikertelen" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "A(z) %s fájl bezárása sikertelen" @@ -2336,7 +2346,7 @@ msgstr "" "A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Start méretét. A " "jelenlegi érték: %lu. (lásd: man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2344,7 +2354,7 @@ msgid "" msgstr "" "Nem lehet növelni az MMap méretét, mert a(z) %lu bájt korlátot már elérte." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2749,7 +2759,7 @@ msgstr "%s átmeneti állapotfájl írása sikertelen" msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" @@ -3289,32 +3299,32 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "„%s” kiadás nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "„%s” verzió nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "„%s” feladat nem található" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3323,19 +3333,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3383,12 +3393,12 @@ msgstr "" msgid "Installing %s" msgstr "%s telepítése" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" @@ -3409,87 +3419,87 @@ msgid "Running post-installation trigger %s" msgstr "A(z) %s telepítés utáni trigger futtatása" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "A(z) „%s” könyvtár hiányzik" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "A(z) „%s” fájl megnyitása sikertelen" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s telepítve" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nem lehet írni ebbe: %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "függőségi hibák - a csomag beállítatlan maradt" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3497,7 +3507,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba " "egy korábbi hiba következménye." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3505,7 +3515,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a " "lemez" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3513,7 +3523,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási " "hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3521,7 +3531,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren " "lévő hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/it.po b/po/it.po index e52d9124f..94d28a51e 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -362,17 +362,17 @@ msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" msgid "Unable to lock the download directory" msgstr "Impossibile bloccare la directory di scaricamento" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -382,7 +382,7 @@ msgstr "" "all'interno del sistema di controllo della versione \"%s\" presso:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -394,80 +394,80 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -476,17 +476,17 @@ msgstr "" "Informazioni sull'architettura non disponibili per %s. Consultare apt." "conf(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -495,7 +495,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -504,14 +504,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo recente" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -520,7 +520,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché la versione " "candidata del pacchetto %s non può soddisfare i requisiti di versione" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -529,30 +529,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -669,7 +669,7 @@ msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" @@ -784,16 +784,16 @@ msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." msgid "Disk not found." msgstr "Disco non trovato" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -802,34 +802,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI non valido, gli URI locali non devono iniziare con //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Accesso in corso" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Impossibile determinare il nome del nodo" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Impossibile determinare il nome locale" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Il server ha rifiutato la connessione e riporta: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER non riuscito, il server riporta: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS non riuscito, il server riporta: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -837,123 +837,123 @@ msgstr "" "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::" "ftp::ProxyLogin è vuoto." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE non riuscito, il server riporta: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Connessione scaduta" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Errore di lettura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Una risposta ha superato le dimensioni del buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Errore di scrittura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Impossibile creare un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Impossibile connettersi al socket dati, tempo esaurito per la connessione" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Non riuscito" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Impossibile connettersi alla socket passiva." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Impossibile eseguire bind() su un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Impossibile eseguire listen() su un socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Impossibile determinare il nome del socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Impossibile inviare il comando PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT non riuscito, il server riporta: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Connessione al socket dati terminata" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossibile recuperare il file, il server riporta: \"%s\"" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Socket dati terminato" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\"" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Interrogazione" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Impossibile invocare " @@ -1020,25 +1020,25 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: firma corretta, ma non è possibile determinare l'impronta " "della chiave." -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "È stata trovata almeno una firma non valida." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è " "installato)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1047,15 +1047,15 @@ msgstr "" "Il file con la firma in chiaro non è valido, ottenuto \"%s\" (la rete " "richiede autenticazione?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1063,35 +1063,35 @@ msgstr "" "Le seguenti firme non sono state verificate perché la chiave pubblica non è " "disponibile:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Errore nel leggere dal server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" @@ -1127,11 +1127,11 @@ msgstr "Formato della data sconosciuto" msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Errore interno" @@ -1392,101 +1392,108 @@ msgstr "Installare questi pacchetti senza verificarli?" msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installato]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installato]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installato]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installato]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ma non è installabile" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ma non è installato" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " oppure" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1495,27 +1502,27 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" @@ -1524,7 +1531,7 @@ msgstr "%lu non completamente installati o rimossi.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1532,21 +1539,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@ -1604,10 +1611,6 @@ msgstr "Eseguito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1723,11 +1726,11 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\"" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" @@ -2053,31 +2056,38 @@ msgstr " %s non ha neppure un campo binario override\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Allocazione della memoria non riuscita" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override %s riga %llu malformato #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Lettura del file override %s non riuscita" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Override %s riga %llu malformato #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Override %s riga %llu malformato #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Override %s riga %llu malformato #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Lettura del file override %s non riuscita" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2105,20 +2115,20 @@ msgstr "Sottoprocesso compresso" msgid "Internal error, failed to create %s" msgstr "Errore interno, creazione di %s non riuscita" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "I/O al sottoprocesso/file non riuscito" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lettura durante l'elaborazione MD5 non riuscita" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Rinomina di %s in %s non riuscita" @@ -2252,12 +2262,12 @@ msgstr "Doppia aggiunta di deviazione %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplicato %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Scrittura del file %s non riuscita" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s non riuscita" @@ -2370,7 +2380,7 @@ msgstr "" "MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il " "valore attuale è: %lu (man 5 apt.conf)." -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2380,7 +2390,7 @@ msgstr "" "byte è stato raggiunto." # (ndt) lunghetta... -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2791,7 +2801,7 @@ msgstr "Scrittura del file temporaneo di stato %s non riuscita" msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file di pacchetto %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file di pacchetto %s (2)" @@ -3345,35 +3355,35 @@ msgid "Hash mismatch for: %s" msgstr "Hash non corrispondente per %s" # (ndt) dovrebbe essere inteso il file Release -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, 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:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" per \"%s\" non trovato" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossibile trovare il task \"%s\"" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3382,21 +3392,21 @@ msgstr "" "Impossibile selezionare la versione installata o la candidata dal pacchetto " "\"%s\" poiché non sono presenti" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3445,12 +3455,12 @@ msgstr "" msgid "Installing %s" msgstr "Installazione di %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" @@ -3471,89 +3481,89 @@ msgid "Running post-installation trigger %s" msgstr "Esecuzione comando di post installazione %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Directory \"%s\" mancante" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Impossibile aprire il file \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Estrazione di %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Pacchetto %s installato" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione alla rimozione di %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Pacchetto %s rimosso" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione completa di %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossibile scrivere in %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "L'operazione è stata interrotta prima di essere completata" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " "di MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "Problemi con le dipendenze - Viene lasciato non configurato" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3561,7 +3571,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica la " "presenza di un fallimento precedente." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3569,7 +3579,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3577,7 +3587,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di memoria esaurita" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3586,7 +3596,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ja.po b/po/ja.po index 8c8e6f4b8..2440aa449 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,17 +352,17 @@ msgstr "内部エラー、問題リゾルバが何かを破壊しました" msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "ます:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -384,80 +384,80 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,17 +466,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." "conf(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" "ケージは新しすぎます" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -661,7 +661,7 @@ msgstr "%s はすでに保留されていません。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" @@ -774,16 +774,16 @@ msgstr "%s の CD-ROM は使用中のためアンマウントすることがで msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -792,34 +792,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "不正な URI です。ローカルの URI は // で始まってはいけません" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "ログインしています" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "ピアネームを決定することができません" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "ローカルネームを決定することができません" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "サーバから接続を拒絶されました。応答: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 失敗、サーバ応答: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 失敗、サーバ応答: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -827,121 +827,121 @@ msgstr "" "プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。" "Acquire::ftp::ProxyLogin が空です。" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 失敗、サーバ応答: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "接続タイムアウト" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "読み込みエラー" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "レスポンスがバッファをオーバフローさせました。" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "書き込みエラー" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "ソケットを作成できません" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失敗" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "パッシブソケットに接続できません。" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo はリスニングソケットを取得できませんでした" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "ソケットをバインドできませんでした" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "ソケットをリスンできませんでした" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "ソケットの名前を特定できませんでした" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT コマンドを送信できません" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "未知のアドレスファミリ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT に失敗しました。サーバ応答: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "データソケット接続タイムアウト" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ファイルを取得できません。サーバ応答 '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "データソケットタイムアウト" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "データ転送に失敗しました。サーバ応答 '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "問い合わせ" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "呼び出せません" @@ -1007,23 +1007,23 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" msgid "Unable to connect to %s:%s:" msgstr "%s:%s へ接続できません:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ" "ていますか?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1032,49 +1032,49 @@ msgstr "" "クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク" "が必要?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "空のファイルは有効なアーカイブと認められません" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" @@ -1110,11 +1110,11 @@ msgstr "不明な日付フォーマットです" msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "接続失敗" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "内部エラー" @@ -1361,101 +1361,108 @@ msgstr "検証なしにこれらのパッケージをインストールします msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [インストール済み]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " または" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1463,27 +1470,27 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" @@ -1492,7 +1499,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除 #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1500,21 +1507,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -1574,10 +1581,6 @@ msgstr "完了" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1691,11 +1694,11 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません" msgid "[Mirror: %s]" msgstr "[ミラー: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" @@ -2012,31 +2015,38 @@ msgstr " %s にバイナリ override エントリがありません\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - メモリの割り当てに失敗しました" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "'%s' をオープンできません" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "不正な override %s %llu 行目 #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "override ファイル %s を読み込むのに失敗しました" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "不正な override %s %llu 行目 #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "不正な override %s %llu 行目 #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "不正な override %s %llu 行目 #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "override ファイル %s を読み込むのに失敗しました" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2064,20 +2074,20 @@ msgstr "圧縮子プロセス" msgid "Internal error, failed to create %s" msgstr "内部エラー、%s の作成に失敗しました" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 の計算中に読み込みに失敗しました" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" @@ -2211,12 +2221,12 @@ msgstr "%s -> %s の diversion が二重に追加されています" msgid "Duplicate conf file %s/%s" msgstr "設定ファイル %s/%s が重複しています" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" @@ -2329,14 +2339,14 @@ msgstr "" "動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現" "在値は %lu です (man 5 apt.conf を参照)。" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2737,7 +2747,7 @@ msgstr "一時状態ファイル %s の書き込みに失敗しました" msgid "Unable to parse package file %s (1)" msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" @@ -3278,32 +3288,32 @@ msgstr "認証レコードが見つかりません: %s" msgid "Hash mismatch for: %s" msgstr "ハッシュサムが適合しません: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "タスク '%s' が見つかりません" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3312,18 +3322,18 @@ msgstr "" "パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない" "ので選べません" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3372,12 +3382,12 @@ msgstr "" msgid "Installing %s" msgstr "%s をインストールしています" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s を削除しています" @@ -3398,87 +3408,87 @@ msgid "Running post-installation trigger %s" msgstr "インストール後トリガ %s を実行しています" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "ディレクトリ '%s' が見つかりません" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "ファイル '%s' をオープンできませんでした" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s に書き込めません" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "操作はそれが完了する前に中断されました" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "MaxReports にすでに達しているため、レポートは書き込まれません" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "依存関係の問題 - 未設定のままにしています" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3486,7 +3496,7 @@ msgstr "" "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" "は書き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3494,7 +3504,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3502,7 +3512,7 @@ msgstr "" "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" "込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3511,7 +3521,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/km.po b/po/km.po index 4f170e3d8..f1d9bee64 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " តារាង​កំណែ ៖" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -354,23 +354,23 @@ msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -378,114 +378,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -494,37 +494,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -636,7 +636,7 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" @@ -729,16 +729,16 @@ msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូ msgid "Disk not found." msgstr "រក​ថាសមិ​ន​ឃើញ​ ។" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -747,155 +747,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI មិនត្រឹមត្រូវ​ URIS មូលដ្ឋានមិនត្រូវ​ចាប់ផ្តើម​ជាមួយ​ // ឡើយ" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "កំពុង​ចូល​" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "មិន​អាច​កំណត់ឈ្មោះដែលត្រូវបង្ហាញ​បានឡើយ​" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "មិន​អាច​កំណត់ឈ្មោះមូលដ្ឋាន​បានឡើយ" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "ម៉ាស៊ីន​បម្រើបានបដិសេធ​ការតភ្ជាប់ ហើយ​ បាននិយាយ ៖ %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER បរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី​ត្រូវ​បាន​បញ្ជាក់​ ប៉ុន្តែ​គ្មាន​ស្គ្រីប​ចូល​ទេ Acquire::ftp::ProxyLogin គឺ ទទេ ។" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ '%s' បានបរាជ័យ ម៉ាស៊ីន​បម្រើ​បាននិយាយ ៖ %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "ការអាន​មានកំហុស" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន​​អស់ចំណុះ ។" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើយ" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "មិនអាចតភ្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្តាប់​​បានឡើយ" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "មិន​អាច​កំណត់​ឈ្មោះរបស់​រន្ធ​បានឡើយ" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន្នន័យ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "សំណួរ​" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "មិន​អាច​ហៅ​ " @@ -961,71 +961,71 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក msgid "Unable to connect to %s:%s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" @@ -1061,11 +1061,11 @@ msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាល msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" @@ -1308,101 +1308,108 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [បានដំឡើង​]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ឬ" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយ​សារតែ​ %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1410,27 +1417,27 @@ msgstr "" "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu ​ត្រូវបានបន្ទាប់ " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" @@ -1439,7 +1446,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1447,21 +1454,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" @@ -1519,10 +1526,6 @@ msgstr "ធ្វើរួច​" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1633,11 +1636,11 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល" @@ -1956,31 +1959,38 @@ msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ព msgid "realloc - Failed to allocate memory" msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "មិន​អាចបើក​ %s បានឡើយ" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2008,20 +2018,20 @@ msgstr "បង្ហាប់កូន" msgid "Internal error, failed to create %s" msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" @@ -2156,12 +2166,12 @@ msgstr "ការបន្ថែម​ស្ទួន នៃការបង្ msgid "Duplicate conf file %s/%s" msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" @@ -2274,14 +2284,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2678,7 +2688,7 @@ msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯក msgid "Unable to parse package file %s (1)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" @@ -3188,49 +3198,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3277,12 +3287,12 @@ msgstr "" msgid "Installing %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "កំពុង​យក %s ចេញ" @@ -3303,111 +3313,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "កំពុងរៀបចំ​ %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "កំពុង​ស្រាយ %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "បាន​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "មិន​អាច​សរសេរ​ទៅ %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ko.po b/po/ko.po index 53ab363a9..bdfc73b70 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "%s 패키지를 찾을 수 없습니다" @@ -153,7 +153,7 @@ msgid " Version table:" msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -345,16 +345,16 @@ msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸 msgid "Unable to lock the download directory" msgstr "다운로드 디렉터리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -363,7 +363,7 @@ msgstr "" "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -374,95 +374,95 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -471,7 +471,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -480,14 +480,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: 설치한 %3$s 패키지가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -496,7 +496,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -505,30 +505,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -643,7 +643,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" @@ -736,16 +736,16 @@ msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 msgid "Disk not found." msgstr "디스크가 없습니다." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -754,34 +754,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다." #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "로그인하는 중입니다" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "상대방의 이름을 알 수 없습니다" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "로컬 이름을 알 수 없습니다" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "서버에서 다음과 같이 연결을 거부했습니다: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 실패, 서버에서는: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 실패, 서버에서는: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -789,121 +789,121 @@ msgstr "" "프록시 서버를 지정했지만 로그인 스크립트가 없습니다. Acquire::ftp::" "ProxyLogin 값이 비어 있습니다." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 실패, 서버에서는: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "연결 시간 초과" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "읽기 오류" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "응답이 버퍼 크기를 넘어갔습니다." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "쓰기 오류" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "소켓을 만들 수 없습니다" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "실패" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "수동(passive) 소켓을 연결할 수 없습니다." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "소켓을 bind할 수 없습니다" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "소켓에 listen할 수 없습니다" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "소켓의 이름을 알아낼 수 없습니다" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT 명령을 보낼 수 없습니다" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 실패, 서버에서는: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "데이터 소켓 연결 시간 초과" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "데이터 소켓에 제한 시간이 초과했습니다" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "데이터 전송 실패, 서버에서는: %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "질의" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " @@ -969,71 +969,71 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생 msgid "Unable to connect to %s:%s:" msgstr "%s:%s에 연결할 수 없습니다:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "해당 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "서버에서 읽는데 오류가 발생했습니다" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "출력 파일에 쓰는데 오류가 발생했습니다" @@ -1069,11 +1069,11 @@ msgstr "데이터 형식을 알 수 없습니다" msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "내부 오류" @@ -1319,101 +1319,108 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까?" msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [설치함]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [설치함]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [설치함]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [설치함]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " 혹은" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1421,27 +1428,27 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" @@ -1450,7 +1457,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1458,21 +1465,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -1531,10 +1538,6 @@ msgstr "완료" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1648,11 +1651,11 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" @@ -1971,31 +1974,38 @@ msgstr " %s에는 binary override 항목이 없습니다\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - 메모리를 할당하는데 실패했습니다" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s 열 수 없습니다" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "%s override 파일을 읽는데 실패했습니다" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "%s override 파일을 읽는데 실패했습니다" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2023,20 +2033,20 @@ msgstr "압축 하위 프로세스" msgid "Internal error, failed to create %s" msgstr "내부 오류, %s 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" @@ -2172,12 +2182,12 @@ msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s 파일을 쓰는데 실패했습니다" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는데 실패했습니다" @@ -2289,14 +2299,14 @@ msgstr "" "동적 mmap이 한계를 벗어났습니다. APT::Cache-Start의 크기를 높이십시오. 현재 " "값: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "mmap 크기를 늘릴 수 없습니다. 이미 %lu 바이트 한계에 도달했습니다." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2693,7 +2703,7 @@ msgstr "임시 상태파일 %s 쓰는데 실패했습니다" msgid "Unable to parse package file %s (1)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" @@ -3210,32 +3220,32 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s" msgid "Hash mismatch for: %s" msgstr "다음의 해시가 다릅니다: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' 작업을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3244,17 +3254,17 @@ msgstr "" "'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니" "다." -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다." -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다." -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다." @@ -3302,12 +3312,12 @@ msgstr "" msgid "Installing %s" msgstr "%s 설치하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s 설정 중입니다" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s 패키지를 지우는 중입니다" @@ -3328,87 +3338,87 @@ msgid "Running post-installation trigger %s" msgstr "설치 후 트리거 %s 실행하는 중입니다" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "디렉터리 '%s' 없습니다." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s 준비 중입니다" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s 패키지를 설정할 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s 설치" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s 패키지를 지울 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s 패키지를 완전히 지웠습니다" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s에 쓸 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3416,20 +3426,20 @@ msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" "적인 오류입니다." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3437,7 +3447,7 @@ msgid "" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ku.po b/po/ku.po index 983afbe57..27b91ba0e 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Pakêt nehate dîtin %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -317,23 +317,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -341,151 +341,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -558,7 +558,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -649,17 +649,17 @@ msgstr "" msgid "Disk not found." msgstr "Dîsk nehate dîtin." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Pel nehate dîtin" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -668,154 +668,154 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Têketin" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nikare navê herêmî tesbît bike" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Çewiya xwendinê" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Çewtiya nivîsînê" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Serneket" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, fuzzy, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Danegira %s nehate vekirin: %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Lêpirsîn" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 #, fuzzy msgid "Unable to invoke " msgstr "%s venebû" @@ -882,71 +882,71 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "" -#: methods/http.cc:659 +#: methods/http.cc:656 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" @@ -983,11 +983,11 @@ msgstr "" msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Çewtiya hundirîn" @@ -1217,127 +1217,134 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sazkirî]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " û" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1346,7 +1353,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 #, fuzzy msgid "[Y/n]" msgstr "[E/n]" @@ -1355,21 +1362,21 @@ msgstr "[E/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1426,10 +1433,6 @@ msgstr "Temam" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1537,11 +1540,11 @@ msgstr "Nikarî pelê %s veke" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Girêdan zû hatiye girtin" @@ -1806,29 +1809,36 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s venebû" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:163 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#: ftparchive/override.cc:175 #, c-format -msgid "Failed to read the override file %s" +msgid "Malformed override %s line %llu #2" +msgstr "" + +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" msgstr "" #: ftparchive/multicompress.cc:70 @@ -1858,20 +1868,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -2000,12 +2010,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Nivîsîna pelê %s biserneket" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Girtina pelê %s biserneket" @@ -2119,14 +2129,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2521,7 +2531,7 @@ msgstr "%s ji hev nehate veçirandin" msgid "Unable to parse package file %s (1)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, fuzzy, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" @@ -3018,49 +3028,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum li hev nayên" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Peywira %s nehate dîtin" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nikarî pakêta %s bibîne" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3105,12 +3115,12 @@ msgstr "" msgid "Installing %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s tê mîhengkirin" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s tê rakirin" @@ -3131,111 +3141,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Peldanka '%s' kêm e" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nikarî pelê %s veke" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s tê derxistin" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Mîhengkirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Bi tevahî rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s bi tevahî hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/lt.po b/po/lt.po index 28f2cc6f3..b6d55782a 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nepavyko rasti paketo %s" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -314,23 +314,23 @@ msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -338,95 +338,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -434,7 +434,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -442,14 +442,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -458,7 +458,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -466,30 +466,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -562,7 +562,7 @@ msgstr "%s ir taip jau yra naujausias.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -653,16 +653,16 @@ msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbūt jis vis dar naudojamas. msgid "Disk not found." msgstr "Diskas nerastas." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Failas nerastas" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -671,154 +671,154 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Jungiamasi" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Jungiamasi per ilgai" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Skaitymo klaida" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Rašymo klaida" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Nepavyko" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Užklausti" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "" @@ -884,70 +884,70 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "" @@ -983,11 +983,11 @@ msgstr "" msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Vidinė klaida" @@ -1229,101 +1229,108 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?" msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Įdiegtas]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " arba" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1331,27 +1338,27 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" @@ -1360,7 +1367,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[T/n]" @@ -1368,21 +1375,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1441,10 +1448,6 @@ msgstr "Įvykdyta" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1555,11 +1558,11 @@ msgstr "Nepavyko atverti failo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nepavyko subprocesui sukurti IPC gijos" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "" @@ -1888,31 +1891,38 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nepavyko išskirti atminties" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nepavyko atverti %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nepavyko nuskaityti perrašymo failo %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nepavyko nuskaityti perrašymo failo %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -1940,20 +1950,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "Vidinė klaida, nepavyko sukurti %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Nepavyko Nusk/Įraš į subprocesą/failą" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Skaitymo klaida skaičiuojant MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nepavyko pervadinti %s į %s" @@ -2090,12 +2100,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2208,14 +2218,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2610,7 +2620,7 @@ msgstr "" msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -3110,49 +3120,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebuvo rasta „%s“ versija paketui „%s“" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nepavyko rasti užduoties %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nepavyko rasti paketo %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3200,12 +3210,12 @@ msgstr "" msgid "Installing %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Konfigūruojamas %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Šalinamas %s" @@ -3226,111 +3236,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Trūksta aplanko „%s“" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Ruošiamas %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Išpakuojamas %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Ruošiamasi konfigūruoti %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Ruošiamasi %s pašalinimui" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Ruošiamasi visiškai pašalinti %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Visiškai pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nepavyko įrašyti į %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/mr.po b/po/mr.po index 7cb972fa1..d10cf403c 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "पॅकेज %s शोधण्यास असमर्थ आहे" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -348,23 +348,23 @@ msgstr "अंतर्गत त्रुटी, अडचण निवार msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -372,114 +372,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -488,37 +488,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -632,7 +632,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" @@ -725,16 +725,16 @@ msgstr "%s मधील सीडी-रॉम अनमाऊंट करण msgid "Disk not found." msgstr "डिस्क सापडत नाही" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "फाईल सापडली नाही" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -743,34 +743,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "लॉग इन करत आहे" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "पिअर नाव सांगण्यास/सापडण्यास असमर्थ" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "स्थानिक नाव सांगण्यास असमर्थ" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "सर्व्हर ने संबंध जोडण्यास नकार दिला व सांगितले: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "सर्व्हरने %s सांगितले,यूजर असमर्थ:" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -778,121 +778,121 @@ msgstr "" "प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन " "निरर्थक आहे." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "सर्व्हरने %s सांगितले, '%s' लॉग इन स्क्रिप्ट आज्ञावली असमर्थ:" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "वेळेअभावी संबंध जोडता येत नाही" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "त्रुटी वाचा" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "प्रतिसाधाने बफर भरुन गेले." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "लिहिण्यात त्रुटी" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "सॉकेट तयार करू शकत नाही" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "असमर्थ" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "पॅसिव्ह सॉकेट जोडता येत नाही" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "सॉकेट चिकटवता येत नाही" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "सॉकेट वर ऐकता येत नाही" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "सॉकेटचे नाव सांगता येत नाही" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा पाठविण्यास असमर्थ" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "डेटा सॉकेट वेळेअभावी तुटले" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "प्रश्न" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "जारी करण्यास करण्यास असमर्थ" @@ -958,72 +958,72 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" @@ -1059,11 +1059,11 @@ msgstr "अपरिचित दिनांक प्रकार/स्वर msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -1312,101 +1312,108 @@ msgstr "पडताळून पाहिल्याशिवाय ही प msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[संस्थापित केले]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "किंवा" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1414,27 +1421,27 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" @@ -1443,7 +1450,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1451,21 +1458,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "होय" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -1523,10 +1530,6 @@ msgstr "झाले" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1637,11 +1640,11 @@ msgstr "%s फाईल उघडता येत नाही" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "जोडणी अकाली बंद झाली" @@ -1961,31 +1964,38 @@ msgstr "%s ला द्वयंक ओव्हरराईड जागा msgid "realloc - Failed to allocate memory" msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s उघडण्यास असमर्थ" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2013,20 +2023,20 @@ msgstr "चॉईल्ड(प्रोसेस)ला संकलित क msgid "Internal error, failed to create %s" msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO ची उपक्रिया/संचिका असमर्थ " -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " @@ -2162,12 +2172,12 @@ msgstr "%s -> %s डायव्हर्जन दुप्पट मिळव msgid "Duplicate conf file %s/%s" msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s फाईल बंद करण्यास असमर्थ" @@ -2279,14 +2289,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2682,7 +2692,7 @@ msgstr "%s तात्पुरत्या StateFile मध्ये लिह msgid "Unable to parse package file %s (1)" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" @@ -3199,49 +3209,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s कार्य सापडू शकले नाही" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3289,12 +3299,12 @@ msgstr "" msgid "Installing %s" msgstr "%s संस्थापित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s संरचित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s काढून टाकत आहे" @@ -3315,111 +3325,111 @@ msgid "Running post-installation trigger %s" msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "'%s' संचयिका गहाळ आहे" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s तयार करित आहे" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s सुटे/मोकळे करीत आहे " -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s संरचने साठी तयार करत आहे" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s संस्थापित झाले" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nb.po b/po/nb.po index 8a3e058ad..a452f57b5 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke å finne pakken %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -354,16 +354,16 @@ msgstr "Intern feil, problemløser ødela noe" msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du må angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -383,116 +383,116 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken " "%s er for ny" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -501,37 +501,37 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -647,7 +647,7 @@ msgstr "%s er allerede nyeste versjon.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" @@ -742,16 +742,16 @@ msgstr "" msgid "Disk not found." msgstr "Disk ikke funnet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -760,34 +760,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Logger inn" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Klarte ikke å fastslå navnet på motparten" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Klarte ikke å fastslå det lokale navnet" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Tjeneren nektet oss å kople til og sa: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -795,121 +795,121 @@ msgstr "" "En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::" "ftp::ProxyLogin» er tomt." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsavbrudd på forbindelsen" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lesefeil" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Et svar oversvømte bufferen." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Klarte ikke å opprette en sokkel" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislyktes" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Klarte ikke å koble til en passiv sokkel." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Klarte ikke å binde til sokkel" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Klarte ikke å lytte til sokkel" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Klarte ikke å avgjøre sokkelnavnet" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Klarte ikke å sende PORT-kommandoen" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjent adressefamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Tidsavbrudd på tilkoblingen til datasokkelen" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikke å hente fila, tjeneren sa «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Tidsavbrudd på datasokkelen" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Spørring" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Klarte ikke å starte" @@ -975,37 +975,37 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjøring av gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "De følgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1013,35 +1013,35 @@ msgstr "" "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen " "ikke er tilgjengelig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" @@ -1077,11 +1077,11 @@ msgstr "Ukjent datoformat" msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Intern feil" @@ -1333,101 +1333,108 @@ msgstr "Installer disse pakkene uten verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installert]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men er ikke installert" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1435,27 +1442,27 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" @@ -1464,7 +1471,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1472,21 +1479,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -1544,10 +1551,6 @@ msgstr "Utført" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1662,11 +1665,11 @@ msgstr "Ingen speilfil «%s» funnet" msgid "[Mirror: %s]" msgstr "[Speil: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" @@ -1987,31 +1990,38 @@ msgstr " %s har ingen binæroverstyringsoppføring heller\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikke å tildele minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Klarte ikke å åpne %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Ugyldig overstyring %s linje %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Klarte ikke å lese overstyringsfila %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Ugyldig overstyring %s linje %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Ugyldig overstyring %s linje %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Ugyldig overstyring %s linje %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Klarte ikke å lese overstyringsfila %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2039,20 +2049,20 @@ msgstr "Komprimer barneprosess" msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikke å opprette %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Klarte ikke å kommunisere med underprosess/fil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Klarte ikke å lese under utregning av MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" @@ -2188,12 +2198,12 @@ msgstr "Dobbel tillegging av avledning %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Klarte ikke å skrive fila %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" @@ -2305,7 +2315,7 @@ msgstr "" "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Start. " "Nåværende verdi: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2314,7 +2324,7 @@ msgstr "" "Klarte ikke øke størrelsen på MMap-en siden grensen på %lu byte allerede er " "nådd." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2712,7 +2722,7 @@ msgstr "Klarte ikke å skrive midlertidig StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke å fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" @@ -3231,32 +3241,32 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsummen stemmer ikke for: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Klarte ikke å finne oppgave «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Klarte ikke finne noen pakken med regex «%s»" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3265,20 +3275,20 @@ msgstr "" "Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den " "har ingen av dem" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3328,12 +3338,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Setter opp %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Fjerner %s" @@ -3354,87 +3364,87 @@ msgid "Running post-installation trigger %s" msgstr "Kjører etter-installasjonsutløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Mappa «%s» mangler" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder oppsett av %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder å fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive til %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "avhengighetsproblemer - lar den være uoppsatt" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3442,7 +3452,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en " "følgefeil fra en tidligere feil." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3450,7 +3460,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3458,7 +3468,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for " "minne»-feil" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3467,7 +3477,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ne.po b/po/ne.po index ff80aaa67..e627077a0 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "प्याकेज %s तोक्न असक्षम भयो" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -352,23 +352,23 @@ msgstr "आन्तरिक त्रुटि,समस्या हलकर msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -376,114 +376,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -492,37 +492,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -634,7 +634,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" @@ -727,16 +727,16 @@ msgstr "%s मा सिडी रोम अनमाउन्ट गर्न msgid "Disk not found." msgstr "डिस्क फेला परेन ।" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -745,34 +745,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "लगइन भइरहेछ" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "समान नाम निर्धारण गर्न असक्षम भयो" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "पास असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -780,121 +780,121 @@ msgstr "" "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin " "खाली छ ।" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "टाइप असफल भयो: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "जडान समय सकियो" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "एउटा सकेट सिर्जना गर्न सकेन" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "असफल भयो" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "निस्क्रिय सकेट जडान गर्न सकिएन" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "सकेट बाँध्न सकिएन" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "सकेटमा सुन्न सकिएन" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "सकेट नाम निर्धारण गर्न सकिएन" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "पोर्ट आदेश पठाउन असक्षम भयो" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "अज्ञात ठेगाना परिवार %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "डेटा सकेटको जडान समय सकियो" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "डेटा सकेट समय सकियो" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "क्वेरी" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "आह्वान गर्न असक्षम भयो" @@ -960,71 +960,71 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" @@ -1060,11 +1060,11 @@ msgstr "अज्ञात मिति ढाँचा" msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -1309,101 +1309,108 @@ msgstr "यी प्याकेजहरू रूजू बिना स् msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [स्थापना भयो]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "वा" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1411,27 +1418,27 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" @@ -1440,7 +1447,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1448,21 +1455,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -1520,10 +1527,6 @@ msgstr "काम भयो" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1634,11 +1637,11 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "जडान असमायिक बन्द भयो" @@ -1958,31 +1961,38 @@ msgstr " %s संग कुनै अधिलेखन प्रविष् msgid "realloc - Failed to allocate memory" msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s खोल्न असफल" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "अधिलेखन फाइल पढ्न असफल %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #२" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "अधिलेखन फाइल पढ्न असफल %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2010,20 +2020,20 @@ msgstr "सङ्कुचन शाखा" msgid "Internal error, failed to create %s" msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 गणना गर्दा पढ्न असफल भयो" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr " %s मा %s पुन:नामकरण असफल भयो" @@ -2158,12 +2168,12 @@ msgstr "मोडको डबल थप %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s फाइल बन्द गर्न असफल भयो" @@ -2276,14 +2286,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2680,7 +2690,7 @@ msgstr "फाइल %s लेख्न असफल भयो" msgid "Unable to parse package file %s (1)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" @@ -3190,49 +3200,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum मेल भएन" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3280,12 +3290,12 @@ msgstr "" msgid "Installing %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr " %s कनफिगर गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr " %s हटाइदैछ" @@ -3306,111 +3316,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr " %s तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr " %s हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr " %s हट्यो" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %s मा लेख्न असक्षम" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nl.po b/po/nl.po index af8172202..f9768da25 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Versietabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -354,18 +354,18 @@ msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -375,7 +375,7 @@ msgstr "" "'%s' op:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -387,97 +387,97 @@ msgstr "" "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " "te halen.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +486,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +495,14 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +511,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -659,7 +659,7 @@ msgstr "%s is reeds de nieuwste versie.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" @@ -753,16 +753,16 @@ msgstr "" msgid "Disk not found." msgstr "Schijf niet gevonden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -771,34 +771,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Bezig met aanmelden" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Kan de 'peer'-naam niet bepalen" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Kan de lokale naam niet bepalen" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Onze verbinding is door de server geweigerd met bericht: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislukt; bericht van server: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislukt; bericht van server: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -806,121 +806,121 @@ msgstr "" "Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::" "ProxyLogin is leeg." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislukt; bericht van server: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Verbinding is verlopen" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Leesfout" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Een reactie deed de buffer overlopen" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Schrijffout" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Kon geen socket aanmaken" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Kon de datasocket niet verbinden, de verbinding verliep" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislukt" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Kon de passieve socket niet verbinden." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kon geen luistersocket verkrijgen" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Kon geen socket binden" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Kon niet op de socket niet luisteren" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Kon de socketnaam niet bepalen" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Kan PORT-commando niet verzenden" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Onbekende adresfamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT is mislukt; bericht van server: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Datasocket verbinding is verlopen" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kan bestand niet ophalen; bericht van server: %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datasocket verliep" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Data transfer is mislukt, server zei: %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Zoekopdracht" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Aanroepen mislukt van " @@ -986,40 +986,40 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kan geen verbinding maken met %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1027,36 +1027,36 @@ msgstr "" "De volgende ondertekeningen konden niet geverifieerd worden omdat de " "publieke sleutel niet beschikbaar is:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" @@ -1094,11 +1094,11 @@ msgstr "Onbekend datumformaat" msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Interne fout" @@ -1353,101 +1353,108 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?" msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Geïnstalleerd]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " of" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1455,27 +1462,27 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" @@ -1484,7 +1491,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1492,21 +1499,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -1564,10 +1571,6 @@ msgstr "Klaar" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1682,11 +1685,11 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" @@ -2013,31 +2016,38 @@ msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Geheugentoewijzing is mislukt" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Kan %s niet openen" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Misvormde voorrangsingang %s op regel %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Lezen van het voorrangsbestand %s is mislukt" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Misvormde voorrangsingang %s op regel %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Misvormde voorrangsingang %s op regel %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Misvormde voorrangsingang %s op regel %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Lezen van het voorrangsbestand %s is mislukt" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2065,20 +2075,20 @@ msgstr "Comprimeer kind" msgid "Internal error, failed to create %s" msgstr "Interne fout, aanmaken van %s is mislukt" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO naar subproces/bestand is mislukt" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" @@ -2214,12 +2224,12 @@ msgstr "Dubbele toevoeging van de omleiding %s->%s" msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" @@ -2331,7 +2341,7 @@ msgstr "" "Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-" "Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2340,7 +2350,7 @@ msgstr "" "Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al " "is bereikt" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2746,7 +2756,7 @@ msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt" msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" @@ -3283,33 +3293,33 @@ msgstr "Kan geen authenticatierecord vinden voor: %s" msgid "Hash mismatch for: %s" msgstr "Hash-som komt niet overeen voor: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Kon taak '%s' niet vinden" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kon geen enkel pakket vinden bij regex '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3318,21 +3328,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3382,12 +3392,12 @@ msgstr "" msgid "Installing %s" msgstr "%s wordt geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" @@ -3408,89 +3418,89 @@ msgid "Running post-installation trigger %s" msgstr "Post-installatie-trigger %s wordt uitgevoerd" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Map '%s' ontbreekt" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s is geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan niet naar %s schrijven" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen " "(MaxReports) al is bereikt" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemen met vereisten - wordt niet geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3498,7 +3508,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een " "eerdere mislukking." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3506,7 +3516,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3514,7 +3524,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over onvoldoende-geheugen." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3523,7 +3533,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nn.po b/po/nn.po index c7bd904ee..0ef1b50ec 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -357,23 +357,23 @@ msgstr "Intern feil. AllUpgrade msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -381,115 +381,115 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -498,37 +498,37 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -641,7 +641,7 @@ msgstr "Den nyaste versjonen av %s er installert fr #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" @@ -736,16 +736,16 @@ msgstr "" msgid "Disk not found." msgstr "Fann ikkje fila" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -754,34 +754,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Loggar inn" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Klarte ikkje avgjera namnet p motparten" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Klarte ikkje avgjera det lokale namnet" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Tenaren nekta oss kopla til, og sa: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislukkast, tenaren sa: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislukkast, tenaren sa: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -789,121 +789,121 @@ msgstr "" "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet " "Acquire::ftp::ProxyLogin er tomt." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandoen %s i innlogginsskriptet mislukkast, tenaren sa: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislukkast, tenaren sa: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsavbrot p samband" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lesefeil" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Eit svar flaumde over bufferen." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Klarte ikkje oppretta sokkel" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislukkast" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Klarte ikkje kopla til passiv sokkel." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Klarte ikkje binda til sokkel" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Klarte ikkje lytta til sokkel" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Klarte ikkje avgjera sokkelnamnet" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Klarte ikkje senda PORT-kommandoen" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjend adressefamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislukkast, tenaren sa: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Tidsavbrot p tilkopling til datasokkel" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikkje henta fila, tenaren sa %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Tidsavbrot p datasokkelen" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverfringa mislukkast, tenaren sa %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Sprjing" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Klarte ikkje starta " @@ -969,71 +969,71 @@ msgstr "Det hende noko dumt ved oppslag av msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" @@ -1069,11 +1069,11 @@ msgstr "Ukjend datoformat" msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Intern feil" @@ -1318,101 +1318,108 @@ msgstr "Installer desse pakkane utan verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installert]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men er ikkje installert" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1421,27 +1428,27 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" @@ -1450,7 +1457,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1458,21 +1465,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -1531,10 +1538,6 @@ msgstr "Ferdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1645,11 +1648,11 @@ msgstr "Klarte ikkje opna fila %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" @@ -1964,31 +1967,38 @@ msgstr " %s har inga overstyringsoppf msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikkje tildela minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Misforma overstyring %s linje %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Klarte ikkje lesa overstyringsfila %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Misforma overstyring %s linje %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Misforma overstyring %s linje %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Misforma overstyring %s linje %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Klarte ikkje lesa overstyringsfila %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2016,20 +2026,20 @@ msgstr "Komprimer barn" msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikkje oppretta %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Klarte ikkje lesa under utrekning av MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" @@ -2164,12 +2174,12 @@ msgstr "Dobbel tilleggjing av avleiing %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" @@ -2282,14 +2292,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2686,7 +2696,7 @@ msgstr "Klarte ikkje skriva fila %s" msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" @@ -3203,49 +3213,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Feil MD5-sum" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3293,12 +3303,12 @@ msgstr "" msgid "Installing %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" @@ -3319,111 +3329,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrdingar" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Klarte ikkje skriva til %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pl.po b/po/pl.po index d6634bef1..a1e4c2aec 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nie udało się odnaleźć pakietu %s" @@ -163,7 +163,7 @@ msgid " Version table:" msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -357,18 +357,18 @@ msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów" msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -378,7 +378,7 @@ msgstr "" "pod adresem:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -390,80 +390,80 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -472,17 +472,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -491,7 +491,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " "w pakietach \"%s\"" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -500,14 +500,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -516,7 +516,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " "pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -525,30 +525,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -663,7 +663,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" @@ -780,16 +780,16 @@ msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używ msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -798,34 +798,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Logowanie się" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nie można określić nazwy zdalnego systemu" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nie udało się określić nazwy lokalnego systemu" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -833,123 +833,123 @@ msgstr "" "Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, " "Acquire::ftp::ProxyLogin jest puste." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: " "%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Przekroczenie czasu połączenia" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Błąd odczytu" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odpowiedź przepełniła bufor." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Błąd zapisu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nie udało się utworzyć gniazda" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Nie udało się" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nie udało się połączyć pasywnego gniazda." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nie udało się przyłączyć gniazda" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nie udało się nasłuchiwać na gnieździe" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nie udało się określić nazwy gniazda" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nie można wysłać polecenia PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Nieznana rodzina adresów %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Przekroczony czas połączenia gniazda danych" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nie można pobrać pliku, odpowiedź serwera: %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Przekroczony czas oczekiwania na dane" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Info" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nie można wywołać " @@ -1015,39 +1015,39 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1055,35 +1055,35 @@ msgstr "" "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza " "publicznego:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogą być prawidłowymi archiwami" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" @@ -1119,11 +1119,11 @@ msgstr "Nieznany format daty" msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Połączenie nie powiodło się" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Błąd wewnętrzny" @@ -1391,101 +1391,108 @@ msgstr "Zainstalować te pakiety bez weryfikacji?" msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Zainstalowany]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " lub" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1493,27 +1500,27 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" @@ -1522,7 +1529,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[T/n]" @@ -1530,21 +1537,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -1602,10 +1609,6 @@ msgstr "Gotowe" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1724,11 +1727,11 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Połączenie zostało przedwcześnie zamknięte" @@ -2051,31 +2054,38 @@ msgstr " %s nie posiada również wpisu w pliku override binariów\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nie udało się zaalokować pamięci" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nie można otworzyć %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Nieprawidłowa linia %llu #1 pliku override %s" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nie udało się czytać pliku override %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Nieprawidłowa linia %llu #1 pliku override %s" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Nieprawidłowa linia %llu #2 pliku override %s" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Nieprawidłowa linia %llu #3 pliku override %s" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nie udało się czytać pliku override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2103,20 +2113,20 @@ msgstr "Potomny proces kompresujący" msgid "Internal error, failed to create %s" msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Zawiodła operacja IO na pliku/podprocesie" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nie udało się zmienić nazwy %s na %s" @@ -2251,12 +2261,12 @@ msgstr "Podwójne dodanie ominięcia %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Nie udało się zapisać pliku %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Nie udało się zamknąć pliku %s" @@ -2368,7 +2378,7 @@ msgstr "" "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" "Start. Bieżąca wartość: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2377,7 +2387,7 @@ msgstr "" "Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już " "osiągnięty." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2781,7 +2791,7 @@ msgstr "Nie udało się zapisać tymczasowego pliku stanu %s" msgid "Unable to parse package file %s (1)" msgstr "Nie udało się zanalizować pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" @@ -3310,35 +3320,35 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nie udało się odnaleźć zadania \"%s\"" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3347,21 +3357,21 @@ msgstr "" "Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", " "ponieważ nie ma żadnej z nich" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3412,12 +3422,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalowanie %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" @@ -3438,87 +3448,87 @@ msgid "Running post-installation trigger %s" msgstr "Uruchamianie wyzwalacza post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Brakuje katalogu \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nie udało się otworzyć pliku \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Przygotowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowywanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Pakiet %s został zainstalowany" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowywanie do usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Pakiet %s został usunięty" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowywanie do całkowitego usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Pakiet %s został całkowicie usunięty" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nie udało się pisać do %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operacja została przerwana, zanim mogła zostać zakończona" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3526,7 +3536,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " "przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3534,7 +3544,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3542,7 +3552,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " "braku wolnej pamięci" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3551,7 +3561,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pt.po b/po/pt.po index c1ae5e6f7..8c6f82bad 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Não foi possível encontrar o pacote %s" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,16 +352,16 @@ msgstr "Erro Interno, o solucionador de problemas estragou coisas" msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -371,7 +371,7 @@ msgstr "" "'%s' em:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -382,81 +382,81 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,18 +465,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido " "em pacotes '%s'" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,14 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,7 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque a versão " "candidata do pacote %s não pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não " "tem versão candidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -659,7 +659,7 @@ msgstr "%s já estava para não manter.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" @@ -773,16 +773,16 @@ msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ficheiro não encontrado" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -791,34 +791,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, URIs locais não devem começar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "A identificar-se no sistema" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Não foi possível determinar o nome do posto" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Não foi possível determinar o nome local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor recusou a ligação e respondeu: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER falhou, o servidor respondeu: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS falhou, o servidor respondeu: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -826,121 +826,121 @@ msgstr "" "Foi especificado um servidor de proxy mas não um script de login, Acquire::" "ftp::ProxyLogin está vazio." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, o servidor respondeu: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Foi atingido o tempo limite de ligação" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Erro de leitura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Uma resposta sobrecarregou o buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erro de escrita" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Não foi possível criar um socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível ligar socket de dados, a ligação expirou" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falhou" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Não foi possível ligar socket passivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo não foi capaz de obter um socket de escuta" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Não foi possível fazer o bind a um socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Não foi possível executar listen no socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Não foi possível determinar o nome do socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Não foi possível enviar o comando PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Família de endereços %u desconhecida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falhou, o servidor respondeu: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Ligação de socket de dados expirou" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Expirou o tempo do socket de dados" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "A transferência de dados falhou, o servidor respondeu '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Não foi possível invocar " @@ -1006,40 +1006,40 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está " "instalado?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1047,35 +1047,35 @@ msgstr "" "As seguintes assinaturas não puderam ser verificadas porque a chave pública " "não está disponível:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios não podem ser arquivos válidos" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" @@ -1111,11 +1111,11 @@ msgstr "Formato de data desconhecido" msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Erro interno" @@ -1367,101 +1367,108 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1469,27 +1476,27 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1498,7 +1505,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1506,21 +1513,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1578,10 +1585,6 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1696,11 +1699,11 @@ msgstr "Não pode ler ficheiro de mirror '%s'" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Ligação encerrada prematuramente" @@ -2023,31 +2026,38 @@ msgstr " %s também não possui entrada binária de 'override'\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Falhou alocar memória" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Não foi possível abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override %s malformado linha %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Falhou ler o ficheiro override %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Override %s malformado linha %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Override %s malformado linha %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Override %s malformado linha %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Falhou ler o ficheiro override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2075,20 +2085,20 @@ msgstr "Compactar filho" msgid "Internal error, failed to create %s" msgstr "Erro Interno, falhou criar %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Falhou o IO para subprocesso/arquivo" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Falhou ler durante o cálculo de MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou renomear %s para %s" @@ -2223,12 +2233,12 @@ msgstr "Adição dupla de desvio %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falhou escrever o ficheiro %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falhou fechar o ficheiro %s" @@ -2340,7 +2350,7 @@ msgstr "" "O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-" "Start. Valor actual: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2349,7 +2359,7 @@ msgstr "" "Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já " "foi alcançado." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2757,7 +2767,7 @@ msgstr "Falha escrever ficheiro temporário StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" @@ -3304,33 +3314,33 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Não foi encontrado o Release '%s' para '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, 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:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Não foi possível encontrar a tarefa '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3339,21 +3349,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3402,12 +3412,12 @@ msgstr "" msgid "Installing %s" msgstr "A instalar %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "A remover %s" @@ -3428,87 +3438,87 @@ msgid "Running post-installation trigger %s" msgstr "A correr o 'trigger' de pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directório '%s'" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir ficheiro o '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Não conseguiu escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "A operação foi interrompida antes de poder terminar" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependências - deixando por configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3516,7 +3526,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro " "de seguimento de um erro anterior." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3524,7 +3534,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3532,7 +3542,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " "memória esgotada" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3541,7 +3551,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 24c4ae30c..c2211ccd0 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Tabela de versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -356,23 +356,23 @@ msgstr "Erro interno, o solucionador de problemas quebrou coisas" msgid "Unable to lock the download directory" msgstr "Impossível criar trava no diretório de download" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -380,97 +380,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,7 +479,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -488,14 +488,14 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -504,7 +504,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando em %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -651,7 +651,7 @@ msgstr "%s já é a versão mais nova.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" @@ -744,16 +744,16 @@ msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" @@ -762,34 +762,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválida, URIs locais não devem iniciar com //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Efetuando login" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Impossível determinar o nome do ponto" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Impossível determinar o nome local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor recusou a conexão e disse: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER falhou, servidor disse: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS falhou, servidor disse: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -797,121 +797,121 @@ msgstr "" "Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::" "ProxyLogin está vazio." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Comando de script de login '%s' falhou, servidor disse: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, servidor disse: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Conexão expirou" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Erro de leitura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Uma resposta sobrecarregou o buffer" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erro de escrita" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Não foi possível criar um socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível conectar um socket de dados, conexão expirou" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falhou" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Não foi possível conectar um socket passivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo não foi capaz de obter um socket de escuta" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Não foi possível fazer \"bind\" de um socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Não foi possível ouvir no socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Não foi possível determinar o nome do socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Impossível enviar o comando PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Família de endereços %u desconhecida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falhou, servidor disse: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Conexão do socket de dados expirou" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema criando o hash do arquivo" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossível obter arquivo, servidor disse '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Socket de dados expirou" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Transferência de dados falhou, servidor disse '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Impossível invocar " @@ -977,18 +977,18 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Impossível conectar em %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura boa, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" @@ -996,22 +996,22 @@ msgstr "" "instalado?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1019,35 +1019,35 @@ msgstr "" "As assinaturas a seguir não puderam ser verificadas devido à chave pública " "não estar disponível:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" @@ -1083,11 +1083,11 @@ msgstr "Formato de data desconhecido" msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Erro interno" @@ -1342,101 +1342,108 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mas não será instalado" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1445,27 +1452,27 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1474,7 +1481,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1482,21 +1489,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1554,10 +1561,6 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1668,11 +1671,11 @@ msgstr "Não foi possível abrir arquivo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falhou ao criar pipe IPC para sub-processo" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" @@ -1999,31 +2002,38 @@ msgstr " %s também não possui entrada override binária\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Falha ao alocar memória" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Impossível abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override malformado %s linha %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Falha ao ler o arquivo override %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Override malformado %s linha %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Override malformado %s linha %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Override malformado %s linha %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Falha ao ler o arquivo override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2051,20 +2061,20 @@ msgstr "Compactar filho" msgid "Internal error, failed to create %s" msgstr "Erro interno, falhou ao criar %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "E/S para sub-processo/arquivo falhou" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Falhou ao ler durante o cálculo MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema removendo %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou ao renomear %s para %s" @@ -2201,12 +2211,12 @@ msgstr "Adição dupla de desvio %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falhou ao escrever arquivo %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falhou ao fechar arquivo %s" @@ -2318,14 +2328,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2724,7 +2734,7 @@ msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s" msgid "Unable to parse package file %s (1)" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" @@ -3255,49 +3265,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum incorreto" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Impossível achar tarefa %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Impossível achar pacote %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3345,12 +3355,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Removendo %s" @@ -3371,111 +3381,111 @@ msgid "Running post-installation trigger %s" msgstr "Executando gatilho pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Diretório '%s' está faltando" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossível escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ro.po b/po/ro.po index 00546ccf2..5ff851765 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nu s-a putut localiza pachetul %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -354,23 +354,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -378,97 +378,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele " "înglobate" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -477,7 +477,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -486,14 +486,14 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +502,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,30 +511,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -650,7 +650,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" @@ -743,16 +743,16 @@ msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat." msgid "Disk not found." msgstr "Disc negăsit." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fișier negăsit" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -761,34 +761,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Se autentifică" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nu se poate detecta numele perechii" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nu s-a putut detecta numele local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serverul a refuzat conexiunea și a spus: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "„USER” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "„PASS” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -796,123 +796,123 @@ msgstr "" "Un server proxy a fost precizat, dar nu există nici un script de conectare, " "Acquire::ftp::ProxyLogin este gol." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "„TYPE” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Timpul de conectare a expirat" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Eroare de citire" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Un răspuns a depășit zona de tampon." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Eroare de scriere" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nu s-a putut crea un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a " "expirat" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Eșec" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nu s-a putut realiza conectarea la un socket pasiv" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nu s-a putut realiza asocierea la un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nu s-a putut asculta pe socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nu s-a putut detecta numele socket-ului" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nu s-a putut trimite comanda PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familie de adrese necunoscută %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "„EPRT” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Timpul de conectare la socket-ul de date expirat" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Timp expirat pentru socket-ul de date" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Transferul de date a eșuat, serverul a spus: '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Interogare" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nu s-a putut invoca" @@ -979,40 +979,40 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" msgid "Unable to connect to %s:%s:" msgstr "Nu s-a putut realiza conexiunea cu %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina " "amprenta digitale a cheii?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1020,36 +1020,36 @@ msgstr "" "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu " "este disponibilă:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" @@ -1085,11 +1085,11 @@ msgstr "Format dată necunoscut" msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Eroare internă" @@ -1348,101 +1348,108 @@ msgstr "Instalați aceste pachete fără verificare?" msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalat]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalat]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "dar nu este instalat" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " sau" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1450,27 +1457,27 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" @@ -1479,7 +1486,7 @@ msgstr "%lu instalate sau șterse incomplet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1487,21 +1494,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -1559,10 +1566,6 @@ msgstr "Terminat" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1674,11 +1677,11 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" @@ -2007,31 +2010,38 @@ msgstr " %s nu are nici intrare binară de înlocuire\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Eșec la alocarea memoriei" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nu s-a putut deschide %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Înlocuire greșită %s linia %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Înlocuire greșită %s linia %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Înlocuire greșită %s linia %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Înlocuire greșită %s linia %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2059,20 +2069,20 @@ msgstr "Comprimare copil" msgid "Internal error, failed to create %s" msgstr "Eroare internă, eșec la crearea lui %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IE către subproces/fișier eșuat" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Eșec la citire în timpul calculului sumei MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Eșec la redenumirea lui %s în %s" @@ -2210,12 +2220,12 @@ msgstr "Adăugare dublă de redirectare %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fișier „conf” duplicat %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Eșec la scrierea fișierului %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Eșec la închiderea fișierului %s" @@ -2328,14 +2338,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2734,7 +2744,7 @@ msgstr "Eșec la scrierea fișierului temporar de stare %s" msgid "Unable to parse package file %s (1)" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" @@ -3261,49 +3271,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nu s-a putut găsi sarcina %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nu pot găsi pachetul %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3351,12 +3361,12 @@ msgstr "" msgid "Installing %s" msgstr "Se instalează %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Se șterge %s" @@ -3377,111 +3387,111 @@ msgid "Running post-installation trigger %s" msgstr "Se rulează declanșatorul post-instalare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Directorul „%s” lipsește." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Se pregătește %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Se pregătește configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregătește ștergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Șters %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregătește ștergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Șters complet %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nu s-a putut scrie în %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ru.po b/po/ru.po index d7dfea572..786621f57 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" @@ -164,7 +164,7 @@ msgid " Version table:" msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -355,17 +355,17 @@ msgstr "Внутренняя ошибка, решатель проблем вс msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -374,7 +374,7 @@ msgstr "" "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -385,80 +385,80 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,17 +467,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +486,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +495,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +511,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -662,7 +662,7 @@ msgstr "%s уже помечен как не зафиксированный.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" @@ -778,16 +778,16 @@ msgstr "Невозможно размонтировать CD-ROM в %s, возм msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -796,34 +796,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Неправильный URI, локальный URI не должен начинаться с //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Вход в систему" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Невозможно определить имя удалённого сервера" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Невозможно определить локальное имя" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сервер разорвал соединение и сообщил: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Команда USER не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Команда PASS не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -831,125 +831,125 @@ msgstr "" "Proxy-сервер указан, однако нет сценария входа в систему, Acquire::ftp::" "ProxyLogin пуст." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Команда «%s» сценария входа в систему завершилась неудачно, сервер сообщил: " "%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Команда TYPE не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Допустимое время ожидания для соединения истекло" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Ошибка чтения" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Ответ переполнил буфер." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Ошибка записи" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Не удалось создать сокет" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Не удалось присоединиться к сокету данных, время на установление соединения " "истекло" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Неудачно" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Невозможно присоединить пассивный сокет" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Вызов getaddrinfo не смог получить сокет" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Невозможно присоединиться к сокету" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Не удалось принимать соединения на сокете" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Не удалось определить имя сокета" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Невозможно послать команду PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестное семейство адресов %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Команда EPRT не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Время установления соединения для сокета данных истекло" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Невозможно получить файл, сервер сообщил: «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Время ожидания соединения для сокета данных истекло" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача данных завершилась неудачно, сервер сообщил: «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Запрос" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Невозможно вызвать " @@ -1015,38 +1015,38 @@ msgstr "Что-то странное произошло при определе msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1054,35 +1054,35 @@ msgstr "" "Следующие подписи не могут быть проверены, так как недоступен открытый " "ключ:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Пустые файлы не могут быть допустимыми архивами" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" @@ -1118,11 +1118,11 @@ msgstr "Неизвестный формат данных" msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -1385,102 +1385,109 @@ msgstr "Установить эти пакеты без проверки?" msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Установлен]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Установлен]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Установлен]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Установлен]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "но он не установлен" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " или" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1488,27 +1495,27 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" @@ -1517,7 +1524,7 @@ msgstr "не установлено до конца или удалено %lu п #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Д/н]" @@ -1525,21 +1532,21 @@ msgstr "[Д/н]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "д" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "н" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" @@ -1599,10 +1606,6 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1718,11 +1721,11 @@ msgstr "Невозможно прочитать файл на зеркале «% msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" @@ -2047,31 +2050,38 @@ msgstr " Нет записи binary override для %s\n" msgid "realloc - Failed to allocate memory" msgstr "realloc — не удалось выделить память" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Не удалось прочесть файл переназначений (override) %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Не удалось прочесть файл переназначений (override) %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2100,20 +2110,20 @@ msgstr "Процесс-потомок, производящий сжатие" msgid "Internal error, failed to create %s" msgstr "Внутренняя ошибка, не удалось создать %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Ошибка чтения во время вычисления MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" @@ -2248,12 +2258,12 @@ msgstr "Двойное добавление diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Повторно указан файл настройки %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" @@ -2365,7 +2375,7 @@ msgstr "" "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. " "Текущее значение: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2373,7 +2383,7 @@ msgid "" msgstr "" "Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2782,7 +2792,7 @@ msgstr "Не удалось записать временный StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Невозможно разобрать содержимое пакета %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" @@ -3318,33 +3328,33 @@ msgstr "Не удалось найти аутентификационную за msgid "Hash mismatch for: %s" msgstr "Не совпадает хеш сумма для: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Выпуск «%s» для «%s» не найден" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия «%s» для «%s» не найдена" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Не удалось найти задачу «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3353,21 +3363,21 @@ msgstr "" "Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так " "как в нём нет ни той, ни другой" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать самую новую версию из пакета «%s», так как он полностью " "виртуальный" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет " "кандидатов" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3416,12 +3426,12 @@ msgstr "" msgid "Installing %s" msgstr "Устанавливается %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Настраивается %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Удаляется %s" @@ -3442,87 +3452,87 @@ msgid "Running post-installation trigger %s" msgstr "Выполняется послеустановочный триггер %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Отсутствует каталог «%s»" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Не удалось открыть файл «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для настройки %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Невозможно записать в %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Действие прервано до его завершения" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Отчёты apport не записаны, так достигнут MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "проблемы с зависимостями — оставляем ненастроенным" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3530,7 +3540,7 @@ msgstr "" "Отчёты apport не записаны, так как сообщение об ошибке указывает на " "повторную ошибку от предыдущего отказа." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3538,7 +3548,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3546,7 +3556,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "памяти" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3555,7 +3565,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sk.po b/po/sk.po index ee6956593..6d55616b7 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nedá sa nájsť balík %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -351,16 +351,16 @@ msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil" msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsť zdrojový balík pre %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -370,7 +370,7 @@ msgstr "" "adrese:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -382,80 +382,80 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na " "zostavenie" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -464,17 +464,17 @@ msgstr "" "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení " "nájdete v apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti na zostavenie %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,20 +483,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -505,7 +505,7 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, " "nedokáže splniť požiadavky na verziu" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -651,7 +651,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" @@ -764,16 +764,16 @@ msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa." msgid "Disk not found." msgstr "Disk sa nenašiel." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Súbor sa nenašiel" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -782,34 +782,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokálne URI nesmie začínať s //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Prihlasovanie" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nedá sa zistiť názov druhej strany" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nedá sa zistiť lokálny názov" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Server zamietol naše spojenie s chybou: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Zlyhalo zadanie hesla, server odpovedal: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -817,121 +817,121 @@ msgstr "" "Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::" "ProxyLogin je prázdny." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Zlyhalo zadanie typu, server odpovedal: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Uplynul čas spojenia" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Chyba pri čítaní" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odpoveď preplnila zásobník." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Chyba pri zápise" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nedá sa vytvoriť socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Chyba" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nedá sa pripojiť pasívny socket." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal počúvajúci socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nedá sa nadviazať socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Na sockete sa nedá počúvať" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Názov socketu sa nedá zistiť" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Príkaz PORT sa nedá odoslať" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznáma rodina adries %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Uplynulo spojenie dátového socketu" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Uplynula doba dátového socketu" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos dát zlyhal, server odpovedal „%s“" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nedá sa vyvolať " @@ -997,36 +997,36 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nedá sa pripojiť k %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1034,35 +1034,35 @@ msgstr "" "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " "kľúč:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Prázdne súbory nemôžu byť platné archívy" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" @@ -1098,11 +1098,11 @@ msgstr "Neznámy formát dátumu" msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Vnútorná chyba" @@ -1362,101 +1362,108 @@ msgstr "Nainštalovať tieto nekontrolované balíky?" msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nainštalovaný]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " alebo" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1464,27 +1471,27 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" @@ -1493,7 +1500,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1501,21 +1508,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -1573,10 +1580,6 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1692,11 +1695,11 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" @@ -2013,31 +2016,38 @@ msgstr " %s nemá žiadnu položku „binary override“\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Zlyhal pokus o pridelenie pamäti" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nedá sa otvoriť %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Skomolený „override“ %s riadok %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nepodarilo sa prečítať „override“ súbor %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Skomolený „override“ %s riadok %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Skomolený „override“ %s riadok %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Skomolený „override“ %s riadok %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nepodarilo sa prečítať „override“ súbor %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2065,20 +2075,20 @@ msgstr "Komprimovať potomka" msgid "Internal error, failed to create %s" msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Chyba čítania pri výpočte MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" @@ -2212,12 +2222,12 @@ msgstr "Dvojité pridanie diverzie %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" @@ -2329,7 +2339,7 @@ msgstr "" "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-" "Start. Aktuálna hodnota: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2337,7 +2347,7 @@ msgid "" msgstr "" "Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2737,7 +2747,7 @@ msgstr "Nie je možné zapísať dočasný StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovať (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" @@ -3261,32 +3271,32 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nebolo možné nájsť úlohu „%s“" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3295,20 +3305,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3357,12 +3367,12 @@ msgstr "" msgid "Installing %s" msgstr "Inštaluje sa %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" @@ -3383,87 +3393,87 @@ msgid "Running post-installation trigger %s" msgstr "Vykonáva sa spúšťač post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Adresár „%s“ chýba" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nedá sa otvoriť súbor „%s“" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Balík „%s“ je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Do %s sa nedá zapisovať" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3471,7 +3481,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v " "nadväznosti na predošlé zlyhanie." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3479,7 +3489,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3487,7 +3497,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " "pamäte" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3496,7 +3506,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sl.po b/po/sl.po index b9bfd6c44..5ece639cc 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ni mogoče najti paketa %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -349,17 +349,17 @@ msgstr "Notranja napaka, reševalnik težav je pokvaril stvari" msgid "Unable to lock the download directory" msgstr "Ni mogoče zakleniti mape prejemov" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -368,7 +368,7 @@ msgstr "" "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -379,80 +379,80 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -461,17 +461,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,20 +479,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -501,7 +501,7 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s ne more zadostiti zahtev različice" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -510,30 +510,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -647,7 +647,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" @@ -759,16 +759,16 @@ msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi." msgid "Disk not found." msgstr "Diska ni mogoče najti." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -777,34 +777,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Neveljaven URI. Krajevni URI-ji se morajo začeti z //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Prijavljanje" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ni mogoče ugotoviti imena gostitelja" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Ni mogoče določiti krajevnega imena" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Strežnik je zavrnil povezavo in sporočil: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -812,121 +812,121 @@ msgstr "" "Naveden je bil posredniški strežnik, ne pa tudi prijavni skript. Acquire::" "ftp::ProxyLogin je prazen." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Povezava je zakasnela" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Strežnik je zaprl povezavo" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Napaka branja" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odgovor je prekoračil predpomnilnik." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Napaka pisanja" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Ni mogoče ustvariti vtiča" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela." -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Spodletelo" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Ni mogoče povezat pasivnega vtiča." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Ni mogoče povezati vtiča" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Ni mogoče poslušati na vtiču" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Ni mogoče določiti imena vtiča" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Ni mogoče poslati ukaza PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznan naslov družine %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ni uspel, strežnik je odgovoril: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Povezava podatkovne vtičnice je zakasnela" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Ni mogoče sprejeti povezave" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Težava med razprševanjem datoteke" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Podatkovna vtič je potekel" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Poizvedba" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Ni mogoče klicati " @@ -992,72 +992,72 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoče povezati z %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Najden je bil vsaj en neveljaven podpis." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznana napaka med izvajanjem gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Naslednji podpisi so bili neveljavni:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Napaka med branjem s strežnika" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Povezava je zakasnela" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Napaka med pisanjem v izhodno datoteko" @@ -1093,11 +1093,11 @@ msgstr "Neznana oblika datuma" msgid "Bad header data" msgstr "Napačni podatki glave" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Notranja napaka" @@ -1361,101 +1361,108 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?" msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nameščeno]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ali" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1463,27 +1470,27 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" @@ -1492,7 +1499,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1500,21 +1507,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" @@ -1572,10 +1579,6 @@ msgstr "Opravljeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1692,11 +1695,11 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" @@ -2014,31 +2017,38 @@ msgstr " %s nima tudi binarnega vnosa prepisa\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Napaka med dodeljevanjem pomnilnika" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Ni mogoče odpreti %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Napaka med branjem prepisane datoteke %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Napaka med branjem prepisane datoteke %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2066,20 +2076,20 @@ msgstr "Podrejeni predmet stiskanja" msgid "Internal error, failed to create %s" msgstr "Notranja napaka. Ni mogoče ustvariti %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "VI podopravila/datoteke je spodletel" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Med računanjem MD5 ni mogoče brati" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Napaka med odvezovanjem %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoče preimenovati %s v %s" @@ -2215,12 +2225,12 @@ msgstr "Dvojni seštevek odklona %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Zapisovanje datoteke %s je spodletelo" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Napaka med zapiranjem datoteke %s" @@ -2332,7 +2342,7 @@ msgstr "" "Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-Start. " "Trenutna vrednost: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2340,7 +2350,7 @@ msgid "" msgstr "" "Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2739,7 +2749,7 @@ msgstr "Pisanje začasne DatotekeStanja %s je spodletelo" msgid "Unable to parse package file %s (1)" msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" @@ -3270,32 +3280,32 @@ msgstr "Ni mogoče najti zapisa overitve za: %s" msgid "Hash mismatch for: %s" msgstr "Neujemanje razpršila za: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Različice '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Ni mogoče najti naloge '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3304,19 +3314,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, 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" @@ -3363,12 +3373,12 @@ msgstr "" msgid "Installing %s" msgstr "Nameščanje %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Odstranjevanje %s" @@ -3389,88 +3399,88 @@ msgid "Running post-installation trigger %s" msgstr "Poganjanje sprožilca po namestitvi %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Mapa '%s' manjka" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Ni mogoče odpreti datoteke '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Pripravljanje %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Razširjanje %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Pripravljanje na nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s je bil nameščen" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravljanje na odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s je bil odstranjen" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravljanje na popolno odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni mogoče pisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "težave odvisnosti - puščanje nenastavljenega" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3478,7 +3488,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " "navezujočo napako iz predhodne napake." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3486,7 +3496,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "polnega diska" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3494,7 +3504,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3502,7 +3512,7 @@ msgstr "" "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo " "na krajevnem sistemu" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sv.po b/po/sv.po index 68195dd85..298573eea 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte hitta paketet %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -350,16 +350,16 @@ msgstr "Internt fel, problemlösaren förstörde någonting" msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -369,7 +369,7 @@ msgstr "" "på:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -380,95 +380,95 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -477,7 +477,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -486,14 +486,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +502,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,31 +511,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -650,7 +650,7 @@ msgstr "%s är redan den senaste versionen.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" @@ -743,16 +743,16 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." msgid "Disk not found." msgstr "Skivan hittades inte." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Filen hittades inte" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -761,34 +761,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ogiltig URI, lokala URI:er får inte börja med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Loggar in" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Kunde inte fastställa namnet på partnern" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Kunde inte fastställa det lokala namnet" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Servern nekade anslutningen och sade: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER misslyckades, servern sade: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS misslyckades, servern sade: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -796,122 +796,122 @@ msgstr "" "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::" "ProxyLogin är tom." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsgränsen för anslutningen överskreds" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Läsfel" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Ett svar spillde bufferten." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivfel" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Kunde inte skapa ett uttag (socket)" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Misslyckades" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Kunde inte ansluta passivt uttag (socket)." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Kunde inte binda ett uttag (socket)" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Kunde inte lyssna på uttaget (socket)" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Kunde inte fastställa uttagets namn (socket)" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Kunde inte sända PORT-kommando" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Okänd adressfamilj %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT misslyckades, servern sade: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hämta filen, servern sade \"%s\"" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataöverföringen misslyckades, servern sade \"%s\"" # Statusmeddelande, byter från substantiv till verb #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Frågar" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Kunde inte starta " @@ -981,39 +981,39 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns " "fingeravtryck?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1021,35 +1021,35 @@ msgstr "" "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är " "tillgänglig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" @@ -1085,11 +1085,11 @@ msgstr "Okänt datumformat" msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Internt fel" @@ -1345,101 +1345,108 @@ msgstr "Installera dessa paket utan verifiering?" msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installerat]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installerat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installerat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installerat]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men det är inte installerat" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1447,27 +1454,27 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" @@ -1476,7 +1483,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1484,21 +1491,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -1556,10 +1563,6 @@ msgstr "Färdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1680,11 +1683,11 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "[Mirror: %s]" msgstr "[Spegel: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" @@ -2007,32 +2010,40 @@ msgstr " %s har heller ingen binär åsidosättningspost\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades med att allokera minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Kunde inte öppna %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Felaktig override %s rad %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Misslyckades med att läsa åsidosättningsfilen %s" + +# parametrar: filnamn, radnummer +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Misslyckades med att läsa åsidosättningsfilen %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2061,20 +2072,20 @@ msgstr "Barnprocess för komprimering" msgid "Internal error, failed to create %s" msgstr "Internt fel, misslyckades med att skapa %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "In/ut för underprocess/fil misslyckades" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Misslyckades med att läsa vid beräkning av MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn på %s till %s" @@ -2209,12 +2220,12 @@ msgstr "Omdirigeringen %s -> %s inlagd två gånger" msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades med att skriva filen %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades med att stänga filen %s" @@ -2326,7 +2337,7 @@ msgstr "" "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. " "Aktuellt värde: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2335,7 +2346,7 @@ msgstr "" "Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har " "uppnåtts." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2737,7 +2748,7 @@ msgstr "Misslyckades med att skriva temporär StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" @@ -3260,33 +3271,33 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunde inte hitta funktionen \"%s\"" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3295,21 +3306,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3359,12 +3370,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerar %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Tar bort %s" @@ -3385,87 +3396,87 @@ msgid "Running post-installation trigger %s" msgstr "Kör efterinstallationsutlösare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Katalogen \"%s\" saknas" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Förbereder %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Förbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Förbereder borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Förbereder borttagning av hela %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kunde inte skriva till %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "beroendeproblem - lämnar okonfigurerad" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3473,7 +3484,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " "ett efterföljande fel från ett tidigare problem." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3481,7 +3492,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3489,7 +3500,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " "är slut" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3498,7 +3509,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/th.po b/po/th.po index ff6bca59b..263830ef1 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "ไม่พบแพกเกจ %s" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -344,16 +344,16 @@ msgstr "เกิดข้อผิดพลาดภายใน: กลไก msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -362,7 +362,7 @@ msgstr "" "ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -373,78 +373,78 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -452,17 +452,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -470,19 +470,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -491,37 +491,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -635,7 +635,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" @@ -745,16 +745,16 @@ msgstr "ไม่สามารถเลิกเมานท์ซีดีร msgid "Disk not found." msgstr "ไม่พบแผ่น" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "ไม่พบแฟ้ม" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -763,154 +763,154 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI ไม่ถูกต้อง URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "เข้าระบบ" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "คำตอบท่วมบัฟเฟอร์" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "ไม่สามารถสร้างซ็อกเก็ต" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "ล้มเหลว" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "ไม่สามารถ bind ซ็อกเก็ต" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "ไม่สามารถส่งคำสั่ง PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "สอบถาม" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "ไม่สามารถเรียก " @@ -976,70 +976,70 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" @@ -1075,11 +1075,11 @@ msgstr "พบรูปแบบวันที่ที่ไม่รู้จ msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -1318,101 +1318,108 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [ติดตั้งอยู่]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " หรือ" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1420,27 +1427,27 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" @@ -1449,7 +1456,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1457,21 +1464,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -1529,10 +1536,6 @@ msgstr "เสร็จแล้ว" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1646,11 +1649,11 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" @@ -1960,31 +1963,38 @@ msgstr " %s ไม่มีข้อมูล override สำหรับไบ msgid "realloc - Failed to allocate memory" msgstr "realloc - จองหน่วยความจำไม่สำเร็จ" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "ไม่สามารถเปิด %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "ไม่สามารถอ่านแฟ้ม override %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "ไม่สามารถอ่านแฟ้ม override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2012,20 +2022,20 @@ msgstr "โพรเซสลูกสำหรับบีบอัด" msgid "Internal error, failed to create %s" msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" @@ -2160,12 +2170,12 @@ msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง" msgid "Duplicate conf file %s/%s" msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "ไม่สามารถเขียนแฟ้ม %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "ไม่สามารถปิดแฟ้ม %s" @@ -2277,14 +2287,14 @@ msgstr "" "MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start ค่าปัจจุบัน: %lu (man 5 " "apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ" @@ -2679,7 +2689,7 @@ msgstr "ไม่สามารถเขียนแฟ้มสถานะช msgid "Unable to parse package file %s (1)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" @@ -3195,32 +3205,32 @@ msgstr "ไม่พบระเบียนยืนยันความแท msgid "Hash mismatch for: %s" msgstr "แฮชไม่ตรงกันสำหรับ: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "ไม่พบรุ่น '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "ไม่พบงานติดตั้ง '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3228,17 +3238,17 @@ msgid "" msgstr "" "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้" @@ -3283,12 +3293,12 @@ msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้ msgid "Installing %s" msgstr "กำลังติดตั้ง %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "กำลังตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "กำลังถอดถอน %s" @@ -3309,113 +3319,113 @@ msgid "Running post-installation trigger %s" msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "ไม่มีไดเรกทอรี '%s'" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "ไม่สามารถเปิดแฟ้ม '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "กำลังเตรียม %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "กำลังแตกแพกเกจ %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "กำลังเตรียมตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "ติดตั้ง %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "กำลังเตรียมถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "ถอดถอน %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/tl.po b/po/tl.po index bc7e5f3c3..180f2732e 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -357,23 +357,23 @@ msgstr "Error na internal, may nasira ang problem resolver" msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -381,95 +381,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +478,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +487,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng " "%s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +503,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,30 +512,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -647,7 +647,7 @@ msgstr "%s ay pinakabagong bersyon na.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" @@ -740,16 +740,16 @@ msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." msgid "Disk not found." msgstr "Hindi nahanap ang Disk." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -758,34 +758,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Pumapasok" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Hindi malaman ang pangalan ng peer" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Hindi malaman ang pangalang lokal" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Bigo ang PASS, sabi ng server ay: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -793,121 +793,121 @@ msgstr "" "May tinakdang katuwang na server ngunit walang login script, walang laman " "ang Acquire::ftp::ProxyLogin." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Bigo ang TYPE, sabi ng server ay: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Lumipas ang koneksyon" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Error sa pagbasa" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "May sagot na bumubo sa buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error sa pagsulat" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Hindi maka-likha ng socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Bigo" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Hindi maka-konekta sa socket na passive." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "di makakuha ang getaddrinfo ng socket na nakikinig" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Hindi maka-bind ng socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Hindi makarinig sa socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Hindi malaman ang pangalan ng socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Hindi makapagpadala ng utos na PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Di kilalang pamilya ng address %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Bigo ang EPRT, sabi ng server ay: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Tanong" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Hindi ma-invoke " @@ -973,40 +973,40 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Hindi maka-konekta sa %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1014,35 +1014,35 @@ msgstr "" "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " "available:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" @@ -1078,11 +1078,11 @@ msgstr "Di kilalang anyo ng petsa" msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Internal na error" @@ -1332,101 +1332,108 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nakaluklok]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1434,27 +1441,27 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" @@ -1463,7 +1470,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[O/h]" @@ -1471,21 +1478,21 @@ msgstr "[O/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[o/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "H" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -1543,10 +1550,6 @@ msgstr "Tapos" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1657,11 +1660,11 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" @@ -1987,31 +1990,38 @@ msgstr " %s ay wala ring override entry na binary\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Bigo ang pagreserba ng memory" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Hindi mabuksan %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Maling anyo ng override %s linya %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Bigo ang pagbasa ng talaksang override %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Maling anyo ng override %s linya %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Maling anyo ng override %s linya %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Maling anyo ng override %s linya %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Bigo ang pagbasa ng talaksang override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2039,20 +2049,20 @@ msgstr "Anak para sa pag-Compress" msgid "Internal error, failed to create %s" msgstr "Error na internal, bigo ang paglikha ng %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Bigo ang IO sa subprocess/talaksan" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" @@ -2188,12 +2198,12 @@ msgstr "Dobleng pagdagdag ng diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Nadobleng talaksang conf %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" @@ -2306,14 +2316,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2717,7 +2727,7 @@ msgstr "Bigo sa pagsulat ng talaksang %s" msgid "Unable to parse package file %s (1)" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" @@ -3243,49 +3253,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Di tugmang MD5Sum" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3333,12 +3343,12 @@ msgstr "" msgid "Installing %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" @@ -3359,111 +3369,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Hindi makapagsulat sa %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/tr.po b/po/tr.po index 2eaaec692..b1bb0f17d 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "%s paketi bulunamadı" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Sürüm çizelgesi:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -353,16 +353,16 @@ msgstr "İç hata, sorun çözücü nesneyi bozdu" msgid "Unable to lock the download directory" msgstr "İndirme dizini kilitlenemiyor" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Kaynağının indirileceği en az bir paket seçilmeli" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s paketinin kaynak paketi bulunamadı" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "yapılmaktadır:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -384,78 +384,78 @@ msgstr "" "bzr branch %s\n" "komutunu kullanın.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s içindeki boş alan miktarı belirlenemedi" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s üzerinde yeterli boş alan yok" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB kaynak arşivi indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB kaynak arşivi indirilecek.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s kaynağını al\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Bazı arşivler alınamadı." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor.\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Paket açma komutu '%s' başarısız.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "İnşa komutu '%s' başarısız oldu.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Alt süreç başarısız" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmedilir" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -464,17 +464,17 @@ msgstr "" "%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) " "rehber sayfasındaki APT::Architectures kısmına göz atın." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s paketinin hiç inşa bağımlılığı yok.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,7 +483,7 @@ msgstr "" "'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s " "bağımlılığı karşılanamıyor." -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -491,12 +491,12 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı." -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni." -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -505,7 +505,7 @@ msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü " "gerekli sürüm şartlarını karşılamıyor" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s için inşa bağımlılıkları karşılanamadı." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "İnşa bağımlılıklarını işleme başarısız oldu" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) paketinin değişim günlüğü" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Desteklenen birimler:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -653,7 +653,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s için beklenildi ama o gelmedi" @@ -766,16 +766,16 @@ msgstr "%s konumundaki CD-ROM çıkarılamıyor, hala kullanımda olabilir." msgid "Disk not found." msgstr "Disk bulunamadı." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Dosya bulunamadı" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -784,34 +784,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Geçersiz URI, yerel URI'ler // ile başlamamalıdır" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Giriş yapılıyor" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Eş adı belirlenemiyor" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Yerel ad belirlenemiyor" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Sunucu bağlantıyı reddetti, sunucunun iletisi: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -819,121 +819,121 @@ msgstr "" "Bir Vekil sunucu belirtildi ancak oturum açma betiği belirtilmedi, Acquire::" "ftp::ProxyLogin boş." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Sunucu bağlantıyı kesti" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Okuma hatası" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Bir yanıt arabelleği taşırdı." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Yazma hatası" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Bir soket oluşturulamadı" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Başarısız" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Edilgen sokete bağlanılamadı." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo bir dinleme soketi alamıyor" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Bir sokete bağlanılamadı" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Soket dinlenemedi" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Soketin adı belirlenemedi" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT komutu gönderilemedi" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Bilinmeyen adres ailesi %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Veri soketi bağlantısı zaman aşımına uğradı" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Bağlantı kabul edilemiyor" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Dosya sağlaması yapılamadı" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Veri soketi zaman aşımına uğradı" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Veri aktarımı başarısız, sunucunun iletisi: '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Sorgu" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Çağrılamıyor " @@ -999,70 +999,70 @@ msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti" msgid "Unable to connect to %s:%s:" msgstr "Bağlanılamıyor %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "İç hata: İmza iyi, ancak anahtar parmak izi belirlenemedi?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "En az bir geçersiz imza ile karşılaşıldı." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "İmza doğrulama için 'gpgv' çalıştırılamadı (gpgv kurulu mu?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv çalıştırılırken bilinmeyen hata" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Aşağıdaki imzalar geçersiz:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Sunucundan okunurken hata" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Seçme başarısız" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Bağlantı zaman aşımına uğradı" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Çıktı dosyasına yazılırken hata" @@ -1098,11 +1098,11 @@ msgstr "Bilinmeyen tarih biçimi" msgid "Bad header data" msgstr "Kötü başlık verisi" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Bağlantı başarısız" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "İç hata" @@ -1358,101 +1358,108 @@ msgstr "Paketler doğrulanmadan kurulsun mu?" msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Kuruldu]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ama kurulu değil" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ya da" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1460,27 +1467,27 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" @@ -1489,7 +1496,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[E/h]" @@ -1497,21 +1504,21 @@ msgstr "[E/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[e/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "H" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" @@ -1571,10 +1578,6 @@ msgstr "Bitti" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1689,11 +1692,11 @@ msgstr "Yansı dosyası %s okunamıyor" msgid "[Mirror: %s]" msgstr "[Yansı: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Altsürece IPC borusu oluşturulamadı" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Bağlantı vaktinden önce kapandı" @@ -2016,31 +2019,38 @@ msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Bellek ayırma yapılamadı" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s açılamıyor" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Hatalı geçersiz kılma %s satır %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Geçersiz kılma dosyası %s okunamadı" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Hatalı geçersiz kılma %s satır %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Hatalı geçersiz kılma %s satır %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Hatalı geçersiz kılma %s satır %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Geçersiz kılma dosyası %s okunamadı" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2068,20 +2078,20 @@ msgstr "Çocuğu sıkıştır" msgid "Internal error, failed to create %s" msgstr "İç hata, %s oluşturulamadı" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 hesaplanırken okunamadı" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s bağı koparılırken sorun çıktı" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s, %s olarak yeniden adlandırılamadı" @@ -2217,12 +2227,12 @@ msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "%s/%s yapılandırma dosyası zaten mevcut" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s dosyasına yazılamadı" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s dosyası kapatılamadı" @@ -2335,14 +2345,14 @@ msgstr "" "Kullanımdaki değer: %lu (ayrıntılı bilgi için man 5 apt.conf komutunu " "kullanın)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "%lu baytlık sınıra ulaşıldığı için MMap boyutu artırılamadı." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2747,7 +2757,7 @@ msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu" msgid "Unable to parse package file %s (1)" msgstr "Paket dosyası %s ayrıştırılamadı (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Paket dosyası %s ayrıştırılamadı (2)" @@ -3287,32 +3297,32 @@ msgstr "%s için kimlik doğrulama kaydı bulunamadı." msgid "Hash mismatch for: %s" msgstr "Sağlama yapılamadı: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' görevi bulunamadı" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3321,17 +3331,17 @@ msgstr "" "'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de " "seçilemiyor" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, 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" @@ -3378,12 +3388,12 @@ msgstr "" msgid "Installing %s" msgstr "%s kuruluyor" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s yapılandırılıyor" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" @@ -3404,88 +3414,88 @@ msgid "Running post-installation trigger %s" msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "'%s' dizini bulunamadı" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "'%s' dosyası açılamadı" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s hazırlanıyor" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s paketi açılıyor" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s paketini yapılandırmaya hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s kuruldu" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s paketinin kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s tamamen kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s dosyasına yazılamıyor" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "İşlem yarıda kesildi" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3493,14 +3503,14 @@ msgstr "" "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " "kaynaklanan bir hata olduğunu belirtiyor." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3508,7 +3518,7 @@ msgstr "" "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport " "raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3516,7 +3526,7 @@ msgid "" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/uk.po b/po/uk.po index 8121d9839..7f7f094c3 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Не можу знайти пакунок %s" @@ -165,7 +165,7 @@ msgid " Version table:" msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -355,18 +355,18 @@ msgstr "Внутрішня помилка, вирішувач проблем щ msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати директорію для завантаження" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -375,7 +375,7 @@ msgstr "" "УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -386,81 +386,81 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -469,17 +469,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -488,7 +488,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -663,7 +663,7 @@ msgstr "%s вже був незафіксований.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікував на %s, але його там не було" @@ -777,17 +777,17 @@ msgstr "" msgid "Disk not found." msgstr "Диск не знайдено." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Файл не знайдено" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -796,34 +796,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Невірне посилання (URI), локальні посилання не повинні починатися з //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Логінюсь в" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Неможливо визначити назву вузла" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Неможливо визначити локальну назву" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сервер розірвав з'єднання, відповівши: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER невдало, сервер мовив: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS невдало, сервер мовив: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -831,121 +831,121 @@ msgstr "" "Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin " "пустий." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Команда '%s' у скрипті логіна не вдалася, сервер мовив: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE невдало, сервер мовив: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Час з'єднання вичерпався" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Помилка зчитування" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Відповідь переповнила буфер." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Помилка запису" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Неможливо створити сокет (socket)" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Невдача" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Неможливо під'єднати пасивний сокет (passive socket)." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Виклик getaddrinfo не зміг отримати слухаючий сокет" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Неможливо приєднатися до сокета" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Неможливо прослухати на сокеті" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Не вдалося визначити назву сокета" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Неможливо відіслати команду PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Невідоме адресове сімейство %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT невдало, сервер мовив: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Час з'єднання з сокетом даних вичерпався" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблема хешування файла" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неможливо завантажити файл, сервер мовив: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Час з'єднання з сокетом (socket) з даними вичерпався" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача даних обірвалася, сервер мовив '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Черга" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Неможливо викликати " @@ -1011,38 +1011,38 @@ msgstr "Сталося щось дивне при спробі отримати msgid "Unable to connect to %s:%s:" msgstr "Неможливо під'єднатися до %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Наступні підписи були невірними:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1050,35 +1050,35 @@ msgstr "" "Наступні підписи не можуть бути перевірені, тому що публічний ключ " "відсутній:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Пусті файли не можуть бути правильними архівами" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Помилка запису у файл" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Помилка зчитування з сервера" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Помилка запису у файл" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Вибір провалився" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Помилка запису у вихідний файл" @@ -1114,11 +1114,11 @@ msgstr "Невідомий формат дати" msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Внутрішня помилка" @@ -1379,101 +1379,108 @@ msgstr "Встановити ці пакунки без перевірки?" msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Встановлено]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "але він не встановлений" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " чи" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1481,27 +1488,27 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" @@ -1510,7 +1517,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1518,21 +1525,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -1591,10 +1598,6 @@ msgstr "Виконано" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1710,11 +1713,11 @@ msgstr "Неможливо прочитати файл дзеркала '%s'" msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC канал для підпроцесу" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "З'єднання завершено передчасно" @@ -2044,31 +2047,38 @@ msgstr " Крім того, відсутній запис про бінарне msgid "realloc - Failed to allocate memory" msgstr "realloc - Не вдалося виділити пам'ять" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Не вдалося відкрити %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Не вдалося прочитати файл перепризначень (override) %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Не вдалося прочитати файл перепризначень (override) %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2096,20 +2106,20 @@ msgstr "Процес-нащадок, що виконує пакування" msgid "Internal error, failed to create %s" msgstr "Внутрішня помилка, не вдалося створити %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Помилка уведення/виводу в підпроцес/файл" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Помилка зчитування під час обчислення MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не вдалося перейменувати %s на %s" @@ -2248,12 +2258,12 @@ msgstr "Подвійне додавання diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Копія конфігураційного файлу %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Не вдалося записати файл %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Не вдалося закрити файл %s" @@ -2367,7 +2377,7 @@ msgstr "" "Динамічний MMap використав усе місце. Будь-ласка, збільшіть розмір APT::" "Cache-Start. Поточне значення: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2375,7 +2385,7 @@ msgid "" msgstr "" "Неможливо збільшити розмір MMap, так як обмеження в %lu байт вже досягнуто." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2782,7 +2792,7 @@ msgstr "Не вдалося записати до тимчасового StateFi msgid "Unable to parse package file %s (1)" msgstr "Неможливо проаналізувати файл пакунку %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неможливо проаналізувати файл пакунку %s (2)" @@ -3310,32 +3320,32 @@ msgstr "Неможливо знайти аутентифікаційний за msgid "Hash mismatch for: %s" msgstr "Невідповідність хешу для: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Випуск '%s' для '%s' не знайдено" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версія '%s' для '%s' не знайдена" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Неможливо знайти завдання '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3344,19 +3354,19 @@ msgstr "" "Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', " "так як вони відсутні" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто " "віртуальним" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3411,12 +3421,12 @@ msgstr "" msgid "Installing %s" msgstr "Встановлюється %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Налаштовується %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Видаляється %s" @@ -3437,89 +3447,89 @@ msgid "Running post-installation trigger %s" msgstr "Виконується післяустановочний ініціатор %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Директорія '%s' відсутня" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Неможливо відкрити файл '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Підготовка %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Розпакування %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Підготовка до конфігурації %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Встановлено %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Підготовка до видалення %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Видалено %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Підготовка до повного видалення %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Повністю видалено %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неможливо записати в %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Операцію було перервано до того, як вона мала завершитися" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Звіт apport не був записаний, тому що параметр MaxReports вже досягнув " "максимальної величини" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "проблеми з залежностями - залишено неналаштованим" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3527,7 +3537,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " "що ця помилка є наслідком попередньої невдачі." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3535,7 +3545,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3543,7 +3553,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця у пам'яті" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3552,7 +3562,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/vi.po b/po/vi.po index 64f332887..8d2b4fac3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2014-01-01 13:45+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Không thể xác định vị trí của gói %s" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -362,16 +362,16 @@ msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" msgid "Unable to lock the download directory" msgstr "Không thể khoá thư mục tải về" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -381,7 +381,7 @@ msgstr "" "“%s” tại:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -392,79 +392,79 @@ msgstr "" "bzr branch %s\n" "để lấy các gói mới nhất (có thể là chưa phát hành).\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ chỗ trống trên %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB từ kho nguồn.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Lấy mã nguồn %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Gặp lỗi khi lấy một số kho." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh biên dịch “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -473,17 +473,17 @@ msgstr "" "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::" "Architectures để cài đặt" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi biên dịch.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -492,7 +492,7 @@ msgstr "" "Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên " "gói “%s”" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -500,14 +500,14 @@ msgid "" msgstr "" "Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là " "quá mới" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -516,7 +516,7 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s " "có thể thỏa mãn điều kiện phiên bản" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -525,30 +525,30 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản " "ứng cử" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Hỗ trợ các mô-đun:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -669,7 +669,7 @@ msgstr "%s đã sẵn được đặt là không giữ lại.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Cần %s nhưng mà không thấy nó ở đây" @@ -799,16 +799,16 @@ msgstr "Không thể bỏ gắn đĩa CD-ROM trong %s. Có lẽ nó vẫn đang msgid "Disk not found." msgstr "Không tìm thấy đĩa." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Không tìm thấy tập tin" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -817,34 +817,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu bằng “//”" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Đang đăng nhập vào" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Không thể quyết định tên ngang hàng" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Không thể phân giải tên cục bộ" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Máy phục vụ đã từ chối kết nối, và đã nói: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Lệnh USER (người dùng) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -852,121 +852,121 @@ msgstr "" "Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. " "“Acquire::ftp::ProxyLogin” là rỗng." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Thời hạn kết nối" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lỗi đọc" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Một trả lời đã tràn bộ đệm." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Lỗi ghi" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Không thể tạo ổ cắm" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Gặp lỗi" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Không thể kết nối ổ cắm bị động." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Không thể đóng kết ổ cắm" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Không thể lắng nghe trên ổ cắm đó" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Không thể quyết định tên ổ cắm đó" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Không thể gửi lệnh PORT (cổng)" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Không biết họ địa chỉ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Quá giờ kết nối ổ cắm dữ liệu" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Gặp vấn đề băm tập tin" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Không thể lấy tập tin: máy phục vụ nói “%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Ổ cắm dữ liệu đã quá giờ" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói “%s”" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Truy vấn" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Không thể gọi " @@ -1032,22 +1032,22 @@ msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - % msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s: %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ: Chữ ký đúng, nhưng không thể xác định vân tay của khóa?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ ký không hợp lệ." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1056,50 +1056,50 @@ msgstr "" "Tập tin Clearsigned không hợp lệ, nhận được “%s” (mạng yêu cầu xác nhận phải " "không?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi không rõ khi thực hiện gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây không hợp lệ:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ: Máy chủ đã đóng kết nối" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin đầu ra" @@ -1139,11 +1139,11 @@ msgstr "Không rõ định dạng ngày" msgid "Bad header data" msgstr "Dữ liệu phần đầu sai" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Kết nối bị lỗi" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -1389,98 +1389,105 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?" msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy về %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" msgstr "đã cài, có thể nâng cấp thành: " -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:202 msgid "[installed,local]" msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "[đã cài, có thể tự động gỡ bỏ]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 msgid "[installed,automatic]" msgstr "[đã cài đặt,tự động]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 msgid "[installed]" msgstr "[đã cài đặt]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, fuzzy, c-format +msgid "[upgradable from: %s]" msgstr "[có thể nâng cấp từ: " -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "[residual-config]" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "nhưng mà nó không được cài đặt" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " hay" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Những gói MỚI sau sẽ được cài đặt:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Những gói sau sẽ bị GỠ BỎ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Những gói sau đây được giữ lại:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Những gói sau đây sẽ được NÂNG CẤP:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Những gói sau đây sẽ bị HẠ CẤP:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Những gói sau đây sẽ được thay đổi:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1488,27 +1495,27 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nâng cấp, %lu được cài đặt mới, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu bị hạ cấp, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" @@ -1517,7 +1524,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[C/k]" @@ -1525,21 +1532,21 @@ msgstr "[C/k]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[c/K]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "C" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "K" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" @@ -1596,10 +1603,6 @@ msgstr "Xong" msgid "Full Text Search" msgstr "Tìm kiếm toàn văn" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1713,11 +1716,11 @@ msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”" msgid "[Mirror: %s]" msgstr "[Bản sao: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng bất ngờ" @@ -2054,31 +2057,38 @@ msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" msgid "realloc - Failed to allocate memory" msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Không thể mở %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Sai override %s dòng %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Sai override %s dòng %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Sai override %s dòng %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Sai override %s dòng %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Việc đọc tập tin đè %s bị lỗi" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2106,20 +2116,20 @@ msgstr "Nén con" msgid "Internal error, failed to create %s" msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Gặp lỗi khi đọc trong khi tính MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Gặp lỗi khi bỏ liên kết %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Việc đổi tên %s thành %s bị lỗi" @@ -2256,12 +2266,12 @@ msgstr "Sự trệch đi được thêm hai lần %s → %s" msgid "Duplicate conf file %s/%s" msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Việc ghi tập tin %s gặp lỗi" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Việc đóng tập tin %s gặp lỗi" @@ -2374,14 +2384,14 @@ msgstr "" "Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" "Giá trị hiện thời là: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2784,7 +2794,7 @@ msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" msgid "Unable to parse package file %s (1)" msgstr "Không thể phân tích tập tin gói %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tích tập tin gói %s (2)" @@ -3325,32 +3335,32 @@ 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:467 +#: apt-pkg/cacheset.cc:469 #, 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:470 +#: apt-pkg/cacheset.cc:472 #, 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:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Không tìm thấy tác vụ “%s”" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, 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:598 +#: apt-pkg/cacheset.cc:600 #, 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:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3359,17 +3369,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:619 +#: apt-pkg/cacheset.cc:621 #, 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:627 +#: apt-pkg/cacheset.cc:629 #, 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:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3418,12 +3428,12 @@ msgstr "" msgid "Installing %s" msgstr "Đang cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s" @@ -3444,88 +3454,88 @@ msgid "Running post-installation trigger %s" msgstr "Đang chạy bẫy sau-cài-đặt %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Thiếu thư mục “%s”" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Không thể mở tập tin “%s”" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format msgid "Can not write log (%s)" msgstr "Không thể ghi nhật ký (%s)" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "/dev/pts đã gắn chưa?" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "Đầu ra là thiết bị cuối?" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3533,14 +3543,14 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " "do một sự thất bại trước đó." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3548,7 +3558,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " "bộ nhớ”" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3556,7 +3566,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " "thống nội bộ" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4f3edaafc..3b3e10554 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -349,16 +349,16 @@ msgstr "内部错误，问题解决工具坏事了" msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -367,7 +367,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -378,114 +378,114 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -494,37 +494,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -639,7 +639,7 @@ msgstr "%s 已经是最新的版本了。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" @@ -732,16 +732,16 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -750,155 +750,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "无效的 URI，本地的 URI 不能以 // 开头" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "正在登录" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "无法获知对方主机名" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "无法获知本地主机名" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "服务器拒绝了我们的连接，响应信息为：%s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "连接超时" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "读错误" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "回应超出了缓存区大小。" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失败" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "无法调用 " @@ -964,70 +964,70 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由于没有公钥，无法验证下列签名：\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "写输出文件时出错" @@ -1063,11 +1063,11 @@ msgstr "无法识别的日期格式" msgid "Bad header data" msgstr "错误的报头数据" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "连接失败" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "内部错误" @@ -1303,101 +1303,108 @@ msgstr "不经验证就安装这些软件包吗？" msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [已安装]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1405,27 +1412,27 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1434,7 +1441,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1442,21 +1449,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -1514,10 +1521,6 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1630,11 +1633,11 @@ msgstr "没有找到镜像文件 %s" msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "连接被永久关闭" @@ -1948,31 +1951,38 @@ msgstr " %s 中没有二进制文件的 override 项\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "无法打开 %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "override 文件 %s 第 %lu 行的格式有误 #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "无法读取 override 文件 %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "override 文件 %s 第 %lu 行的格式有误 #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "override 文件 %s 第 %lu 行的格式有误 #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "无法读取 override 文件 %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2000,20 +2010,20 @@ msgstr "压缩子进程" msgid "Internal error, failed to create %s" msgstr "内部错误，无法创建 %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" @@ -2148,12 +2158,12 @@ msgstr "添加了两个转移项 %s-> %s" msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" @@ -2265,14 +2275,14 @@ msgstr "" "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 " "apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。" @@ -2668,7 +2678,7 @@ msgstr "无法写入临时状态文件 %s" msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" @@ -3184,49 +3194,49 @@ msgstr "无法找到认证记录：%s" msgid "Hash mismatch for: %s" msgstr "Hash 校验和不符：%s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "无法找到任务 %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "无法从完全虚拟的软件包 %s 中选择版本" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, 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:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "因为软件包 %s 没有候选版本，无法进行选择" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本" @@ -3273,12 +3283,12 @@ msgstr "" msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "正在删除 %s" @@ -3299,112 +3309,112 @@ msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 缺失" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "无法打开文件 %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "无法写入 %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 18aac83ea..123cef942 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-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "找不到套件 %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -350,23 +350,23 @@ msgstr "內部錯誤，問題排除器造成了損壞" msgid "Unable to lock the download directory" msgstr "無法鎖定下載目錄" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 的原始碼套件" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -374,114 +374,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "無法確認 %s 的未使用空間" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "在 %s 裡沒有足夠的的未使用空間" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %sB/%sB 的原始套件檔。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "下載完成，且這是『僅下載』模式" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "不解開，因原始碼已解開至 %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -489,37 +489,37 @@ msgid "" msgstr "" "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正和 %s (%s) 連線" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "已支援模組：" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -632,7 +632,7 @@ msgstr "%s 已經是最新版本了。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它並不存在" @@ -724,16 +724,16 @@ msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。" msgid "Disk not found." msgstr "找不到磁碟。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "找不到檔案" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "無法設定修改時間" @@ -742,155 +742,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "不正確的 URI，本機 URI 不應以 // 開頭" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "登入中" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "無法解析對方主機名稱" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "無法解析本機名稱" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "伺服器不接受連線，並回應：%s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "連線逾時" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "伺服器已關閉連線" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "讀取錯誤" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "回應超過緩衝區長度。" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "協定失敗" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "寫入錯誤" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "無法建立 Socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "無法和 data socket 連線，連線逾時" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失敗" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "無法和 passive socket 連線。" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 無法取得監聽 socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "無法 bind 至 socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "無法監聽 socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "無法解析 socket 名稱" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "無法送出 PORT 指令" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "未知的地址家族 %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Data socket 連線逾時" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "無法接受連線" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "有問題的雜湊檔" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "無法取得檔案，伺服器回應 '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Data socket 連線逾時" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "資料傳輸失敗，伺服器回應 '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "查詢" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "無法 invoke " @@ -956,71 +956,71 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事" msgid "Unable to connect to %s:%s:" msgstr "無法連線至 %s %s：" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "至少發現一個無效的簽章。" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "在執行 gpgv 時發生未知的錯誤" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "以下簽名無效：\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" @@ -1056,11 +1056,11 @@ msgstr "未知的資料格式" msgid "Bad header data" msgstr "錯誤的標頭資料" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "連線失敗" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "內部錯誤" @@ -1303,101 +1303,108 @@ msgstr "是否不經驗證就安裝這些套件？" msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "【已安裝】" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "【已安裝】" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "【已安裝】" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "【已安裝】" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有未滿足的相依關係：" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "但 %s 卻已安裝" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "但 %s 卻將被安裝" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "但它卻無法安裝" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "但它是虛擬套件" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "但它卻尚未安裝" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "但它卻將不會被安裝" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "或" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "下列【新】套件將會被安裝：" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "下列套件將會被【移除】：" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "下列套件將會維持其原有版本：" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "下列套件將會被升級：" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "下列套件將會被【降級】：" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "下列被保留 (hold) 的套件將會被更改：" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1405,27 +1412,27 @@ msgstr "" "【警告】：下列的基本套件都將被移除。\n" "除非您很清楚您在做什麼，否則請勿輕易嘗試！" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升級 %lu 個，新安裝 %lu 個，" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個，" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "降級 %lu 個，" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "移除 %lu 個，有 %lu 個未被升級。\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個沒有完整得安裝或移除。\n" @@ -1434,7 +1441,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1442,21 +1449,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -1514,10 +1521,6 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1628,11 +1631,11 @@ msgstr "無法開啟檔案 %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "無法和子程序建立 IPC 管線" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "連線突然終止" @@ -1947,31 +1950,38 @@ msgstr " %s 也沒有二元碼重新定義項目\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - 無法配置記憶體" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "無法開啟 %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "無法讀取重新定義檔 %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "無法讀取重新定義檔 %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -1999,20 +2009,20 @@ msgstr "壓縮子程序" msgid "Internal error, failed to create %s" msgstr "內部錯誤，無法建立 %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "和子程序/檔案 IO 失敗" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "在計算 MD5 時無法讀取到資料" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "在取消 %s 的連結時發生問題" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" @@ -2146,12 +2156,12 @@ msgstr "重複加入抽換資訊 %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" @@ -2265,14 +2275,14 @@ msgstr "" "動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為：%lu。" "(man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2668,7 +2678,7 @@ msgstr "無法寫入暫存的 StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "無法辨識套件檔 %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" @@ -3174,49 +3184,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "找不到 '%2$s' 的 '%1$s' 發行版" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "找不到 '%s' 版的 '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "無法找到主題 %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "無法找到套件 %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3262,12 +3272,12 @@ msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而 msgid "Installing %s" msgstr "正在安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "正在設定 %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "正在移除 %s" @@ -3288,111 +3298,111 @@ msgid "Running post-installation trigger %s" msgstr "正在執行安裝後套件後續處理程式 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "找不到 '%s' 目錄" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "無法開啟檔案 %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "正在準備 %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "正在解開 %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "正在準備設定 %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "已安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備移除 %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "已移除 %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "正在準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "無法寫入 %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -- cgit v1.2.3 From a7250ed08e4761dd40870ea7350ca2c83457e890 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Feb 2014 20:48:52 +0100 Subject: fix remaining testcase-bugs from my armel box Git-Dch: Ignore --- test/integration/test-apt-get-autoremove | 10 +-- .../test-architecture-specification-parsing | 82 ++++++++++++---------- ...ight-loop-configure-with-unpacking-new-packages | 29 ++++++-- 3 files changed, 70 insertions(+), 51 deletions(-) diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove index 68ea1c574..acde4b096 100755 --- a/test/integration/test-apt-get-autoremove +++ b/test/integration/test-apt-get-autoremove @@ -42,12 +42,12 @@ testsuccess aptget autoremove -y testdpkgnotinstalled 'po-debconf' testmarkedauto -sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -testfileequal 'rootdir/var/log/apt/history.log' ' -Install: unrelated:i386 (1), debhelper:i386 (8.0.0), po-debconf:i386 (1.0.16, automatic) - +sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e 's#), #)\nInstall: #g' | sort -u > apt-history.log +testfileequal 'apt-history.log' ' +Install: debhelper:i386 (8.0.0) +Install: po-debconf:i386 (1.0.16, automatic) +Install: unrelated:i386 (1) Remove: debhelper:i386 (8.0.0) - Remove: po-debconf:i386 (1.0.16)' testsuccess aptget install debhelper -y diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing index 2741509a7..a43354871 100755 --- a/test/integration/test-architecture-specification-parsing +++ b/test/integration/test-architecture-specification-parsing @@ -4,102 +4,106 @@ set -e TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture 'amd64' 'armel' -buildsimplenativepackage 'pkg-arch-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !amd64] -Depends: foo [amd64 !amd64]' -buildsimplenativepackage 'pkg-arch-no-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!amd64 amd64] -Depends: foo [!amd64 amd64]' -buildsimplenativepackage 'pkg-arch-foo-unrelated-no' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!kfreebsd-any amd64] -Depends: foo [!kfreebsd-any amd64]' -buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !kfreebsd-any] -Depends: foo [amd64 !kfreebsd-any]' -buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armhf], bar [arm] -Depends: foo [armhf], bar [arm]' +# we need this construct here as it isn't really possible to fake native arch for dpkg-* tools +NATIVE="$(command dpkg --print-architecture)" +configarchitecture "${NATIVE}" 'armel' + +buildsimplenativepackage 'pkg-arch-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !${NATIVE}] +Depends: foo [${NATIVE} !${NATIVE}]" +buildsimplenativepackage 'pkg-arch-no-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!${NATIVE} ${NATIVE}] +Depends: foo [!${NATIVE} ${NATIVE}]" +buildsimplenativepackage 'pkg-arch-foo-unrelated-no' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!kfreebsd-any ${NATIVE}] +Depends: foo [!kfreebsd-any ${NATIVE}]" +buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !kfreebsd-any] +Depends: foo [${NATIVE} !kfreebsd-any]" +buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armeb], bar [arm] +Depends: foo [armeb], bar [arm]' -buildsimplenativepackage 'foo' 'amd64' '1.0' 'stable' +buildsimplenativepackage 'foo' "$NATIVE" '1.0' 'stable' insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign' setupaptarchive -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following extra packages will be installed: foo The following NEW packages will be installed: foo pkg-arch-foo 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Inst pkg-arch-foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64]) -Conf pkg-arch-foo (1.0 stable [amd64])' aptget install pkg-arch-foo -s +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: pkg-arch-no-foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst pkg-arch-no-foo (1.0 stable [amd64]) -Conf pkg-arch-no-foo (1.0 stable [amd64])' aptget install pkg-arch-no-foo -s +Inst pkg-arch-no-foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following extra packages will be installed: foo The following NEW packages will be installed: foo pkg-arch-foo-unrelated-no 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Inst pkg-arch-foo-unrelated-no (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64]) -Conf pkg-arch-foo-unrelated-no (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no -s +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following extra packages will be installed: foo The following NEW packages will be installed: foo pkg-arch-foo-unrelated-no2 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Inst pkg-arch-foo-unrelated-no2 (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64]) -Conf pkg-arch-foo-unrelated-no2 (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no2 -s +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo -s +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s testequal 'Reading package lists... Building dependency tree... 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no -s +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no2 -s +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s testequal 'Reading package lists... Building dependency tree... 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s # this is not really testing APT - more that dpkg is in line with us +configarchitecture 'amd64' 'armel' testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages index 7f3b05e59..5856cd744 100755 --- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages +++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages @@ -15,19 +15,18 @@ Breaks: libreoffice-core (>= 3+), libreoffice-core (<= 3~), libreoffice-style-ga insertinstalledpackage 'libreoffice-style-galaxy' 'amd64' '3' 'Depends: libreoffice-core Provides: libreoffice-style' -buildsimplenativepackage 'libreoffice' 'amd64' '4' 'sid' 'Depends: libreoffice-core (= 4)' -buildsimplenativepackage 'libreoffice-core' 'amd64' '4' 'sid' 'Depends: libreoffice-common (>= 4) +insertpackage 'sid' 'libreoffice' 'amd64' '4' 'Depends: libreoffice-core (= 4)' +insertpackage 'sid' 'libreoffice-core' 'amd64' '4' 'Depends: libreoffice-common (>= 4) Breaks: libreoffice-common (<< 4), libreoffice-style-galaxy (<< 4)' -buildsimplenativepackage 'libreoffice-common' 'all' '4' 'sid' 'Depends: libreoffice-style, ure +insertpackage 'sid' 'libreoffice-common' 'all' '4' 'Depends: libreoffice-style, ure Breaks: libreoffice-core (>= 4+), libreoffice-core (<= 4~), libreoffice-style-galaxy (>= 4+), libreoffice-style-galaxy (<= 4~)' -buildsimplenativepackage 'libreoffice-style-galaxy' 'amd64' '4' 'sid' 'Depends: libreoffice-core +insertpackage 'sid' 'libreoffice-style-galaxy' 'amd64' '4' 'Depends: libreoffice-core Provides: libreoffice-style' - -buildsimplenativepackage 'ure' 'amd64' '4' 'sid' +insertpackage 'sid' 'ure' 'amd64' '4' setupaptarchive -testequal 'Reading package lists... +testequalor2 'Reading package lists... Building dependency tree... The following NEW packages will be installed: ure @@ -43,4 +42,20 @@ Conf ure (4 sid [amd64]) Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice-common (4 sid [all]) Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice (4 sid [amd64])' 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + ure +The following packages will be upgraded: + libreoffice libreoffice-common libreoffice-core libreoffice-style-galaxy +4 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libreoffice [3] (4 sid [amd64]) [] +Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-common [3] (4 sid [all]) [] +Inst ure (4 sid [amd64]) +Conf ure (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) +Conf libreoffice-common (4 sid [all]) +Conf libreoffice-core (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s -- cgit v1.2.3 From 6008b79adf1d7ea5607fab87a355d664c8725026 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Feb 2014 21:46:29 +0100 Subject: simplify code to make compilers happy Does the same as before, but is a bit simpler on the logic for humans as well as compilers. scan-build complained about it at least with: "Result of operation is garbage or undefined" Reported-By: scan-build --- apt-pkg/contrib/fileutl.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 37155b688..71ac9c73f 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1594,11 +1594,17 @@ unsigned long long FileFd::Tell() unsigned long long FileFd::FileSize() { struct stat Buf; - if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) - return FileFdErrno("fstat","Unable to determine the file size"); + + bool ispipe = (d != NULL && d->pipe == true); + if (ispipe == false) + { + if (fstat(iFd,&Buf) != 0) + return FileFdErrno("fstat","Unable to determine the file size"); + ispipe = S_ISFIFO(Buf.st_mode); + } // for compressor pipes st_size is undefined and at 'best' zero - if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) + if (ispipe == true) { // we set it here, too, as we get the info here for free // in theory the Open-methods should take care of it already -- cgit v1.2.3 From e1195cf603e74568325fa1fa8f9fcb63259aeb2c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Feb 2014 21:59:11 +0100 Subject: update libapt-pkg.symbols file --- debian/libapt-pkg4.12.symbols | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index af43a7b07..40a68e5b3 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1459,7 +1459,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1 - (c++)"APT::Progress::PackageManagerFancy::Start()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1 @@ -1483,7 +1482,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1 - (c++)"APT::Progress::PackageManager::Start()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1 @@ -1512,6 +1510,23 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"vtable for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 (c++)"vtable for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 (c++)"vtable for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::instances@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManagerFancy::Start(int)@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManagerFancy::staticSIGWINCH(int)@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManager::Start(int)@Base" 0.9.14.2 +### client-side merged pdiffs + (c++)"pkgAcqIndexMergeDiffs::DescURI()@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs()@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&, DiffInfo const&, std::vector<pkgAcqIndexMergeDiffs*, std::allocator<pkgAcqIndexMergeDiffs*> > const*)@Base" 0.9.14.3~exp1 + (c++)"typeinfo for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 + (c++)"typeinfo name for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 + (c++)"vtable for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 +### deb822 sources.list format + (c++)"pkgSourceList::ParseFileDeb822(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1 + (c++)"pkgSourceList::ParseFileOldStyle(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1 + (c++)"pkgSourceList::Type::ParseStanza(std::vector<metaIndex*, std::allocator<metaIndex*> >&, pkgTagSection&, int, FileFd&)@Base" 0.9.14.3~exp1 ### mixed stuff (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp13 (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10 @@ -1570,6 +1585,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashString::FromFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13.1 (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1 (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 + (c++)"GetTempDir()@Base" 0.9.14.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0 ### gcc artefacts -- cgit v1.2.3 From a5c657563746d2576b662f1711723312fcb1c186 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Feb 2014 22:01:45 +0100 Subject: bump Standards-Version to 3.9.5 (no changes needed) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f3303e891..0c1341bb9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, Julian Andres Klode <jak@debian.org> -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, -- cgit v1.2.3 From bfa1ebf5d062dfcdb2019725df9069148ceaef0b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Feb 2014 23:32:53 +0100 Subject: disable doxygen undocumented method warning Very few methods we have are documented, so this is A LOT of noise hidden the "interesting" warnings about methods which are documented, but incorrectly and such stuff. Git-Dch: Ignore --- doc/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 9ebbd9673..306bab1dc 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -613,7 +613,7 @@ WARNINGS = YES # for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = NO # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for # potential errors in the documentation, such as not documenting some -- cgit v1.2.3 From 436bcfbb16ce558c228a3a6e29ad77c0c62664bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Feb 2014 14:42:56 +0100 Subject: do not use an empty APT_CONFIG environment variable --- apt-pkg/init.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 81b601a7f..6ab5ec42d 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -92,7 +92,7 @@ bool pkgInitConfig(Configuration &Cnf) // Read an alternate config file const char *Cfg = getenv("APT_CONFIG"); - if (Cfg != 0) + if (Cfg != 0 && strlen(Cfg) != 0) { if (RealFileExists(Cfg) == true) Res &= ReadConfigFile(Cnf,Cfg); -- cgit v1.2.3 From 34d6ece7566ea4fcda2286478b31641378aefc93 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Feb 2014 17:55:13 +0100 Subject: always cleanup patchfiles at the end of rred call With APT::Get::List-Cleanup disabled the ed-style patch files are lingering in the lists/ directory otherwise. That was kinda okay in the old none-client-merge as the filename was always the same so it was constantly overridden, but now with different names for client-merge quiet a few could pill up on the system and are used by the next call as it picks them up based on the filename. --- apt-pkg/acquire-item.cc | 9 +++++++++ test/integration/test-pdiff-usage | 28 +++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1185908f3..60003c023 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -757,6 +757,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has { // remove the just applied patch available_patches.erase(available_patches.begin()); + unlink((FinalFile + ".ed").c_str()); // move into place if(Debug) @@ -887,6 +888,14 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string M // otherwise lists cleanup will eat the file DestFile = FinalFile; + // ensure the ed's are gone regardless of list-cleanup + for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin(); + I != allPatches->end(); ++I) + { + std::string patch = FinalFile + ".ed." + (*I)->patch.file + ".gz"; + unlink(patch.c_str()); + } + // all set and done Complete = true; if(Debug) diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index ad31511b9..afe1ad443 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -31,6 +31,16 @@ wasmergeused() { msgfail fi + msgtest 'No intermediate patch files' 'still exist' + local EDS="$(find rootdir/var/lib/apt/lists -name '*.ed' -o -name '*.ed.*')" + if [ -z "$EDS" ]; then + msgpass + else + echo + echo "$EDS" + msgfail + fi + msgtest 'Check if the right pdiff merger was used' if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' $OUTPUT; then if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then @@ -46,7 +56,7 @@ wasmergeused() { } testrun() { - # setup the base + msgmsg "Testcase: setup the base with: $*" find aptarchive -name 'Packages*' -type f -delete cp ${PKGFILE} aptarchive/Packages compressfile 'aptarchive/Packages' @@ -59,7 +69,7 @@ testrun() { testequal "$(cat ${PKGFILE}) " aptcache show apt oldstuff - msgmsg 'Testcase: apply with one patch' + msgmsg "Testcase: apply with one patch: $*" cp ${PKGFILE}-new aptarchive/Packages compressfile 'aptarchive/Packages' mkdir -p aptarchive/Packages.diff @@ -82,13 +92,13 @@ SHA1-Patches: testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - msgmsg 'Testcase: index is already up-to-date' + msgmsg "Testcase: index is already up-to-date: $*" find rootdir/var/lib/apt/lists -name '*.IndexDiff' -type f -delete testsuccess aptget update "$@" testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - msgmsg 'Testcase: apply with two patches' + msgmsg "Testcase: apply with two patches: $*" cp ${PKGFILE}-new aptarchive/Packages echo ' Package: futurestuff @@ -129,7 +139,7 @@ SHA1-Patches: testequal "$(cat Packages-future) " aptcache show apt newstuff futurestuff - msgmsg 'Testcase: patch applying fails, but successful fallback' + msgmsg "Testcase: patch applying fails, but successful fallback: $*" rm -rf rootdir/var/lib/apt/lists cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists cp ${PKGFILE}-new aptarchive/Packages @@ -154,6 +164,10 @@ SHA1-Patches: testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff } +echo 'Debug::pkgAcquire::Diffs "true"; +Debug::pkgAcquire::rred "true";' > rootdir/etc/apt/apt.conf.d/rreddebug.conf -testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=0 -testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=1 +testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1 +testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1 +testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0 +testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=0 -- cgit v1.2.3 From e209542632e61b9bf07b809c333f1e4b9de7fde9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Feb 2014 18:06:28 +0100 Subject: use VersionSet in download to handle repeats Closes: 738103 --- cmdline/apt-get.cc | 6 +++--- test/integration/test-apt-get-download | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6bff6e7de..2a9964722 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -630,8 +630,8 @@ bool DoDownload(CommandLine &CmdL) return false; APT::CacheSetHelper helper(c0out); - APT::VersionList verset = APT::VersionList::FromCommandLine(Cache, - CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper); + APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache, + CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); if (verset.empty() == true) return false; @@ -650,7 +650,7 @@ bool DoDownload(CommandLine &CmdL) std::string const cwd = SafeGetCWD(); _config->Set("Dir::Cache::Archives", cwd); int i = 0; - for (APT::VersionList::const_iterator Ver = verset.begin(); + for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver, ++i) { pkgAcquire::Item *I = new pkgAcqArchive(&Fetcher, SrcList, &Recs, *Ver, storefile[i]); diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index c2a5c3d8e..ec809e0ce 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -34,8 +34,13 @@ testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) SHA512:$(sh # deb:677887 testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms -# deb:736962 - apt-get download foo && -aptget download apt -aptget download apt +# deb:736962 +testsuccess aptget download apt +testsuccess aptget download apt +testsuccess test -s apt_2.0_all.deb + +rm -f apt_1.0_all.deb apt_2.0_all.deb + +# deb:738103 +testsuccess aptget download apt apt apt/unstable apt=2.0 testsuccess test -s apt_2.0_all.deb -rm -f apt_1.0_all.deb -- cgit v1.2.3 From 246bbb611d4cd5e2a13ecffb6cbe0e76390eae6f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Feb 2014 21:52:38 +0100 Subject: use utimes instead of utimensat/futimens cppcheck complains about the obsolete utime as it was removed in POSIX1.2008 and recommends usage of utimensat/futimens instead as those are in POSIX and so commit 9ce3cfc9 switched to them. It is just that they aren't as portable as the standard suggests: At least our kFreeBSD and Hurd ports stumble over it at runtime. So to make both, the ports and cppcheck happy, we use utimes instead. Closes: 738567 --- apt-inst/dirstream.cc | 9 +++++---- ftparchive/multicompress.cc | 3 ++- methods/copy.cc | 14 ++++++-------- methods/ftp.cc | 18 +++++++++--------- methods/gzip.cc | 22 ++++++++-------------- methods/https.cc | 6 +++--- methods/rred.cc | 9 +++++---- methods/rsh.cc | 18 +++++++++--------- methods/server.cc | 12 ++++++------ 9 files changed, 53 insertions(+), 58 deletions(-) diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index b62bdcae1..e06c30a57 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -19,6 +19,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/time.h> #include <errno.h> #include <unistd.h> #include <apti18n.h> @@ -95,11 +96,11 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd) /* Set the modification times. The only way it can fail is if someone has futzed with our file, which is intolerable :> */ - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = times[1].tv_sec = Itm.MTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(Fd, times) != 0) - _error->Errno("futimens", "Failed to set modification time for %s",Itm.Name); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm.Name, times) != 0) + _error->Errno("utimes", "Failed to set modification time for %s",Itm.Name); if (close(Fd) != 0) return _error->Errno("close",_("Failed to close file %s"),Itm.Name); diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index c1bd6037a..1555d2f2d 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -24,6 +24,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <iostream> @@ -237,7 +238,7 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) if (UpdateMTime > 0 && (Now - St.st_mtime > (signed)UpdateMTime || St.st_mtime > Now)) { - utimensat(AT_FDCWD, I->Output.c_str(), NULL, AT_SYMLINK_NOFOLLOW); + utimes(I->Output.c_str(), NULL); Changed = true; } } diff --git a/methods/copy.cc b/methods/copy.cc index 744cc2b51..f2a8f9ed8 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -18,6 +18,7 @@ #include <apt-pkg/hashes.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <apti18n.h> /*}}}*/ @@ -70,18 +71,15 @@ bool CopyMethod::Fetch(FetchItem *Itm) } From.Close(); + To.Close(); // Transfer the modification times - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Buf.st_atime; times[1].tv_sec = Buf.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(To.Fd(), times) != 0) - { - To.OpFail(); - return _error->Errno("futimens",_("Failed to set modification time")); - } - To.Close(); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Res.Filename.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); diff --git a/methods/ftp.cc b/methods/ftp.cc index 2d05364d5..70bf4f607 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -954,11 +954,11 @@ void FtpMethod::SigTerm(int) _exit(100); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); @@ -1062,11 +1062,11 @@ bool FtpMethod::Fetch(FetchItem *Itm) Fd.Close(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); // If the file is missing we hard fail and delete the destfile // otherwise transient fail @@ -1081,11 +1081,11 @@ bool FtpMethod::Fetch(FetchItem *Itm) Res.Size = Fd.Size(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(Fd.Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Fd.Name().c_str(), times); FailFd = -1; } diff --git a/methods/gzip.cc b/methods/gzip.cc index f1edb353b..a2844e969 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -18,6 +18,7 @@ #include <apt-pkg/hashes.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <stdio.h> #include <errno.h> @@ -93,6 +94,8 @@ bool GzipMethod::Fetch(FetchItem *Itm) } From.Close(); + Res.Size = To.FileSize(); + To.Close(); if (Failed == true) return false; @@ -102,23 +105,14 @@ bool GzipMethod::Fetch(FetchItem *Itm) if (stat(Path.c_str(),&Buf) != 0) return _error->Errno("stat",_("Failed to stat")); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Buf.st_atime; - times[1].tv_sec = Buf.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(To.Fd(), times) != 0) - { - To.OpFail(); - return _error->Errno("futimens",_("Failed to set modification time")); - } - Res.Size = To.FileSize(); - To.Close(); - - if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat")); + Res.LastModified = times[1].tv_sec = Buf.st_mtime; + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm->DestFile.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); // Return a Done response - Res.LastModified = Buf.st_mtime; Res.TakeHashes(Hash); URIDone(Res); diff --git a/methods/https.cc b/methods/https.cc index e16e36339..146b2bfb8 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -404,11 +404,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_getinfo(curl, CURLINFO_FILETIME, &Res.LastModified); if (Res.LastModified != -1) { - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Res.LastModified; times[1].tv_sec = Res.LastModified; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(File->Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(File->Name().c_str(), times); } else Res.LastModified = resultStat.st_mtime; diff --git a/methods/rred.cc b/methods/rred.cc index f7dac3c19..fe7ef7322 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#include <sys/time.h> #include <apti18n.h> @@ -597,12 +598,12 @@ class RredMethod : public pkgAcqMethod { stat(patch_name.c_str(), &bufpatch) != 0) return _error->Errno("stat", _("Failed to stat")); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = bufbase.st_atime; times[1].tv_sec = bufpatch.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (utimensat(AT_FDCWD, Itm->DestFile.c_str(), times, 0) != 0) - return _error->Errno("utimensat",_("Failed to set modification time")); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm->DestFile.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(), &bufbase) != 0) return _error->Errno("stat", _("Failed to stat")); diff --git a/methods/rsh.cc b/methods/rsh.cc index a441220bf..4e1aaea26 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -396,11 +396,11 @@ void RSHMethod::SigTerm(int sig) _exit(100); // Transfer the modification times - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); _exit(100); @@ -488,11 +488,11 @@ bool RSHMethod::Fetch(FetchItem *Itm) Fd.Close(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); // If the file is missing we hard fail otherwise transient fail if (Missing == true) @@ -502,11 +502,11 @@ bool RSHMethod::Fetch(FetchItem *Itm) } Res.Size = Fd.Size(); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(Fd.Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Fd.Name().c_str(), times); FailFd = -1; } diff --git a/methods/server.cc b/methods/server.cc index e12c23c07..76faa7e7f 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -369,11 +369,11 @@ void ServerMethod::SigTerm(int) if (FailFd == -1) _exit(100); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); _exit(100); @@ -539,10 +539,10 @@ int ServerMethod::Loop() File = 0; // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = times[1].tv_sec = Server->Date; - times[0].tv_nsec = times[1].tv_nsec = 0; - utimensat(AT_FDCWD, Queue->DestFile.c_str(), times, AT_SYMLINK_NOFOLLOW); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Queue->DestFile.c_str(), times); // Send status to APT if (Result == true) -- cgit v1.2.3 From 62dcbf84c4aee8cb01e40c594d4c7f3a23b64836 Mon Sep 17 00:00:00 2001 From: John Ogness <john.ogness@linutronix.de> Date: Fri, 13 Dec 2013 20:59:31 +0100 Subject: apt-cdrom should succeed if any drive succeeds If there are multiple CD-ROM drives, `apt-cdrom add` will abort with an error if any of the drives do not contain a Debian CD which is against the documentation we have saying "a CD-ROM" and also scripts do not expect it this way. This patch modifies apt-cdrom to return success if any of the drives succeeded. If failures occur, apt-cdrom will still continue trying all the drives and report the last failure (if none of them succeeded). The 'ident' command was also changed to match the new 'add' behavior. Closes: 728153 --- apt-pkg/cdrom.cc | 26 ++++++++++++++++-- cmdline/apt-cdrom.cc | 76 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 83 insertions(+), 19 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index a5668a50a..f577e3572 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -577,8 +577,30 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ CDROM.c_str()); log->Update(msg.str()); } - if (MountCdrom(CDROM) == false) - return _error->Error("Failed to mount the cdrom."); + + // Unmount the CD and get the user to put in the one they want + if (_config->FindB("APT::CDROM::NoMount",false) == false) + { + if(log != NULL) + log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); + UnmountCdrom(CDROM); + + if(log != NULL) + { + log->Update(_("Waiting for disc...\n"), STEP_WAIT); + if(!log->ChangeCdrom()) { + // user aborted + return false; + } + } + + // Mount the new CDROM + if(log != NULL) + log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT); + + if (MountCdrom(CDROM) == false) + return _error->Error("Failed to mount the cdrom."); + } // Hash the CD to get an ID if (log != NULL) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 17a60ddcb..20c6e8892 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -111,10 +111,12 @@ OpProgress* pkgCdromTextStatus::GetOpProgress() }; /*}}}*/ // SetupAutoDetect /*{{{*/ -bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i) +bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted) { bool Debug = _config->FindB("Debug::Acquire::cdrom", false); + automounted = false; + vector<struct CdromDevice> v = UdevCdroms.Scan(); if (i >= v.size()) return false; @@ -137,6 +139,8 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i) mkdir(AptMountPoint.c_str(), 0750); if(MountCdrom(AptMountPoint, v[i].DeviceName) == false) _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str()); + else + automounted = true; _config->Set("Acquire::cdrom::mount", AptMountPoint); _config->Set("APT::CDROM::NoMount", true); } @@ -160,17 +164,35 @@ bool DoAdd(CommandLine &) bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); unsigned int count = 0; + string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); + bool automounted = false; if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count)) - res &= cdrom.Add(&log); - if (count == 0) { - res = cdrom.Add(&log); - if (res == false) { - _error->Error("%s", _(W_NO_CDROM_FOUND)); + while (AutoDetectCdrom(UdevCdroms, count, automounted)) { + if (count == 1) { + // begin loop with res false to detect any success using OR + res = false; + } + + // dump any warnings/errors from autodetect + if (_error->empty() == false) + _error->DumpErrors(); + + res |= cdrom.Add(&log); + + if (automounted) + UnmountCdrom(AptMountPoint); + + // dump any warnings/errors from add/unmount + if (_error->empty() == false) + _error->DumpErrors(); } - } - if(res) + if (count == 0) + res = cdrom.Add(&log); + + if (res == false) + _error->Error("%s", _(W_NO_CDROM_FOUND)); + else cout << _("Repeat this process for the rest of the CDs in your set.") << endl; return res; @@ -187,18 +209,38 @@ bool DoIdent(CommandLine &) pkgCdrom cdrom; bool res = true; - bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect"); + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); unsigned int count = 0; + string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); + bool automounted = false; if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count)) - res &= cdrom.Ident(ident, &log); - if (count == 0) { - res = cdrom.Ident(ident, &log); - if (res == false) { - _error->Error("%s", _(W_NO_CDROM_FOUND)); + while (AutoDetectCdrom(UdevCdroms, count, automounted)) { + if (count == 1) { + // begin loop with res false to detect any success using OR + res = false; + } + + // dump any warnings/errors from autodetect + if (_error->empty() == false) + _error->DumpErrors(); + + res |= cdrom.Ident(ident, &log); + + if (automounted) + UnmountCdrom(AptMountPoint); + + // dump any warnings/errors from add/unmount + if (_error->empty() == false) + _error->DumpErrors(); } - } + + if (count == 0) + res = cdrom.Ident(ident, &log); + + if (res == false) + _error->Error("%s", _(W_NO_CDROM_FOUND)); + return res; } /*}}}*/ -- cgit v1.2.3 From ce55512d4924b52c985276c62a0c69ac13e203cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Feb 2014 02:12:40 +0100 Subject: remove duplication in pkgCdrom::Add and ::Ident Git-Dch: Ignore --- apt-pkg/cdrom.cc | 131 +++++++++++++----------------------------- apt-pkg/cdrom.h | 4 ++ debian/libapt-pkg4.12.symbols | 1 + 3 files changed, 46 insertions(+), 90 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index f577e3572..3ae1e8b1d 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -561,25 +561,23 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source) return true; } /*}}}*/ -bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ +bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log)/*{{{*/ { - stringstream msg; - // Startup - string CDROM = _config->FindDir("Acquire::cdrom::mount"); + CDROM = _config->FindDir("Acquire::cdrom::mount"); if (CDROM[0] == '.') CDROM= SafeGetCWD() + '/' + CDROM; if (log != NULL) { - msg.str(""); - ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"), - CDROM.c_str()); - log->Update(msg.str()); + string msg; + log->SetTotal(STEP_LAST); + strprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str()); + log->Update(msg, STEP_PREPARE); } // Unmount the CD and get the user to put in the one they want - if (_config->FindB("APT::CDROM::NoMount",false) == false) + if (_config->FindB("APT::CDROM::NoMount", false) == false) { if(log != NULL) log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); @@ -604,24 +602,24 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ // Hash the CD to get an ID if (log != NULL) - log->Update(_("Identifying.. ")); - + log->Update(_("Identifying.. "), STEP_IDENT); if (IdentCdrom(CDROM,ident) == false) { ident = ""; + if (log != NULL) + log->Update("\n"); return false; } if (log != NULL) { - msg.str(""); - ioprintf(msg, "[%s]\n",ident.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, "[%s]\n", ident.c_str()); + log->Update(msg); } // Read the database - Configuration Database; string DFile = _config->FindFile("Dir::State::cdroms"); if (FileExists(DFile) == true) { @@ -629,12 +627,22 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ return _error->Error("Unable to read the cdrom database %s", DFile.c_str()); } + return true; +} + /*}}}*/ +bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ +{ + Configuration Database; + std::string CDROM; + if (MountAndIdentCDROM(Database, CDROM, ident, log) == false) + return false; + if (log != NULL) { - msg.str(""); - ioprintf(msg, _("Stored label: %s\n"), - Database.Find("CD::"+ident).c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("Stored label: %s\n"), + Database.Find("CD::"+ident).c_str()); + log->Update(msg); } // Unmount and finish @@ -650,70 +658,13 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ /*}}}*/ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ { - stringstream msg; - - // Startup - string CDROM = _config->FindDir("Acquire::cdrom::mount"); - if (CDROM[0] == '.') - CDROM= SafeGetCWD() + '/' + CDROM; - - if(log != NULL) - { - log->SetTotal(STEP_LAST); - msg.str(""); - ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str()); - log->Update(msg.str(), STEP_PREPARE); - } - - // Read the database Configuration Database; - string DFile = _config->FindFile("Dir::State::cdroms"); - if (FileExists(DFile) == true) - { - if (ReadConfigFile(Database,DFile) == false) - return _error->Error("Unable to read the cdrom database %s", - DFile.c_str()); - } - - // Unmount the CD and get the user to put in the one they want - if (_config->FindB("APT::CDROM::NoMount",false) == false) - { - if(log != NULL) - log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); - UnmountCdrom(CDROM); - - if(log != NULL) - { - log->Update(_("Waiting for disc...\n"), STEP_WAIT); - if(!log->ChangeCdrom()) { - // user aborted - return false; - } - } - - // Mount the new CDROM - if(log != NULL) - log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT); - - if (MountCdrom(CDROM) == false) - return _error->Error("Failed to mount the cdrom."); - } - - // Hash the CD to get an ID - if(log != NULL) - log->Update(_("Identifying.. "), STEP_IDENT); - string ID; - if (IdentCdrom(CDROM,ID) == false) - { - if (log != NULL) - log->Update("\n"); + std::string ID, CDROM; + if (MountAndIdentCDROM(Database, CDROM, ID, log) == false) return false; - } + if(log != NULL) - { - log->Update("["+ID+"]\n"); log->Update(_("Scanning disc for index files..\n"),STEP_SCAN); - } // Get the CD structure vector<string> List; @@ -762,12 +713,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if (_config->FindB("APT::CDROM::DropTranslation", true) == true) DropTranslation(TransList); if(log != NULL) { - msg.str(""); - ioprintf(msg, _("Found %zu package indexes, %zu source indexes, " + string msg; + strprintf(msg, _("Found %zu package indexes, %zu source indexes, " "%zu translation indexes and %zu signatures\n"), List.size(), SourceList.size(), TransList.size(), SigList.size()); - log->Update(msg.str(), STEP_SCAN); + log->Update(msg, STEP_SCAN); } if (List.empty() == true && SourceList.empty() == true) @@ -800,9 +751,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if(log != NULL) { - msg.str(""); - ioprintf(msg, _("Found label '%s'\n"), Name.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("Found label '%s'\n"), Name.c_str()); + log->Update(msg); } Database.Set("CD::" + ID + "::Label",Name); } @@ -846,9 +797,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ Database.Set("CD::" + ID,Name); if(log != NULL) { - msg.str(""); - ioprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str()); + log->Update(msg); log->Update(_("Copying package lists..."), STEP_COPY); } @@ -906,7 +857,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if(log != NULL) { - msg.str(""); + stringstream msg; msg << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) << " " << string(*I,Space+1) << endl; log->Update(msg.str()); @@ -924,7 +875,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ } if(log != NULL) { - msg.str(""); + stringstream msg; msg << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) << " " << string(*I,Space+1) << endl; log->Update(msg.str()); diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 7d19eb813..db637b96d 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -69,6 +69,10 @@ class pkgCdrom /*{{{*/ public: bool Ident(std::string &ident, pkgCdromStatus *log); bool Add(pkgCdromStatus *log); + + private: + bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, + std::string &ident, pkgCdromStatus * const log); }; /*}}}*/ diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 40a68e5b3..3236d227a 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1586,6 +1586,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1 (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 (c++)"GetTempDir()@Base" 0.9.14.2 + (c++|optional=private)"pkgCdrom::MountAndIdentCDROM(Configuration&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, pkgCdromStatus*)@Base" 0.9.15.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0 ### gcc artefacts -- cgit v1.2.3 From 8f3594c3487800edc2a97af1f3290049776dc556 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 12 Feb 2014 07:59:07 +0100 Subject: Use a APT::VersionSet instead of a VersionList Use a APT::VersionSet instead of a APT::VersionList in DoDownload() to ensure that there is only one version in the set even if the user passes multiple identical name/versions on the commandline (Bug#738103) --- cmdline/apt-get.cc | 6 +++--- test/integration/test-apt-get-download | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 1019ff325..4d609104c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -630,8 +630,8 @@ bool DoDownload(CommandLine &CmdL) return false; APT::CacheSetHelper helper(c0out); - APT::VersionList verset = APT::VersionList::FromCommandLine(Cache, - CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper); + APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache, + CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); if (verset.empty() == true) return false; @@ -650,7 +650,7 @@ bool DoDownload(CommandLine &CmdL) std::string const cwd = SafeGetCWD(); _config->Set("Dir::Cache::Archives", cwd); int i = 0; - for (APT::VersionList::const_iterator Ver = verset.begin(); + for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver, ++i) { pkgAcquire::Item *I = new pkgAcqArchive(&Fetcher, SrcList, &Recs, *Ver, storefile[i]); diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index c2a5c3d8e..0d92283f1 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -39,3 +39,8 @@ aptget download apt aptget download apt testsuccess test -s apt_2.0_all.deb rm -f apt_1.0_all.deb + +# deb:738103 - apt-get download foo foo fails +rm -f apt_*.deb +aptget download apt apt +testsuccess test -s apt_2.0_all.deb -- cgit v1.2.3 From add49c7a4568491c6e9486a6744840f7bc446ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Ng=E1=BB=8Dc=20Qu=C3=A2n?= <vnwildman@gmail.com> Date: Mon, 10 Feb 2014 07:57:04 +0700 Subject: l10n: vi.po (621t): Update and review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com> --- po/vi.po | 2768 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 1388 insertions(+), 1380 deletions(-) diff --git a/po/vi.po b/po/vi.po index 8d2b4fac3..78bc3cda5 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt 0.9.14.2\n" +"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-06 20:46+0100\n" -"PO-Revision-Date: 2014-01-01 13:45+0700\n" +"POT-Creation-Date: 2014-02-10 07:15+0700\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" "Language: vi\n" @@ -167,7 +167,7 @@ msgstr " Bảng phiên bản:" #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s dành cho %s được biên dịch vào %s %s\n" +msgstr "%s-%s được biên dịch cho %s vào lúc “%s %s”\n" #: cmdline/apt-cache.cc:1740 msgid "" @@ -233,14 +233,14 @@ msgstr "" " policy - Hiển thị các cài đặt chính sách\n" "\n" "Tùy chọn:\n" -" -h Trợ giúp này.\n" +" -h Hiển thị trợ giúp này.\n" " -p=? Bộ nhớ tạm gói.\n" " -s=? Bộ nhớ tạm nguồn.\n" -" -q Không hiển thị diễn tiến.\n" +" -q Không hiển thị diễn tiến công việc.\n" " -i Chỉ hiển thị những phụ thuộc quan trọng cho lệnh unmet.\n" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. -o dir::cache=/tmp\n" -"Để tìm thông tin thêm, xem hai trang man (hướng dẫn)\n" +"Để tìm thông tin thêm, xem hai trang hướng dẫn\n" " apt-cache(8) và apt.conf(5).\n" #. }}} @@ -257,11 +257,11 @@ msgstr "" #: cmdline/apt-cdrom.cc:89 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "Hãy cung cấp tên cho Đĩa này, ví dụ như là: “Debian 5.0.3 Đĩa 1”" +msgstr "Hãy cung cấp tên cho Đĩa này, kiểu như là: “Debian 5.0.3 Đĩa 1”" #: cmdline/apt-cdrom.cc:104 msgid "Please insert a Disc in the drive and press enter" -msgstr "Hãy đưa đĩa vào ổ và bấm nút Enter" +msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter" #: cmdline/apt-cdrom.cc:139 #, c-format @@ -687,11 +687,10 @@ msgstr "Hủy bỏ nắm giữ %s.\n" #: cmdline/apt-mark.cc:334 msgid "Executing dpkg failed. Are you root?" msgstr "" -"Thực thi lệnh dpkg gặp lỗi. Bạn có cần quyền siêu người dùng (root) để làm " -"việc này" +"Thực thi lệnh “dpkg” gặp lỗi. Bạn có cần quyền siêu người dùng để thực thi " +"lệnh này" #: cmdline/apt-mark.cc:381 -#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -726,6 +725,11 @@ msgstr "" "Lệnh:\n" " auto - Đánh dấu các gói đưa ra là được cài đặt tự động\n" " manual - Đánh dấu các gói đưa ra là được cài đặt bằng tay\n" +" hold - Đánh dấu một gói là giữ lại\n" +" unhold - Bỏ đánh dấu một gói là giữ lại\n" +" showauto - In ra danh sách các gói được tự động cài đặt\n" +" showmanual - In ra danh sách các gói được cài đặt bằng tay\n" +" showhold - In ra danh sách các gói được giữ lại\n" "\n" "Tùy chọn:\n" " -h Trợ giúp này.\n" @@ -739,7 +743,6 @@ msgstr "" " apt-mark(8) và apt.conf(5)" #: cmdline/apt.cc:71 -#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" @@ -768,8 +771,13 @@ msgstr "" " show - hiển thị thông tin chi tiết về gói\n" "\n" " update - cập nhật danh sánh các gói sẵn có\n" +"\n" " install - cài đặt các gói\n" +" remove - gỡ bỏ các gói\n" +"\n" " upgrade - nâng cấp các gói trong hệ thống\n" +" full-upgrade - nâng cấp hệ thống bằng cách gỡ bỏ, cài đặt, nâng cấp các " +"gói\n" "\n" " edit-sources - sửa tập tin thông tin gói nguồn\n" @@ -1392,12 +1400,12 @@ msgstr "Gặp lỗi khi lấy về %s %s\n" #: apt-private/private-output.cc:72 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" -msgstr "" +msgstr "không hiểu" #: apt-private/private-output.cc:198 -#, fuzzy, c-format +#, c-format msgid "[installed,upgradable to: %s]" -msgstr "đã cài, có thể nâng cấp thành: " +msgstr "[đã cài, có thể nâng cấp thành: %s]" #: apt-private/private-output.cc:202 msgid "[installed,local]" @@ -1405,7 +1413,7 @@ msgstr "[đã cài đặt,nội bộ]" #: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" -msgstr "[đã cài, có thể tự động gỡ bỏ]" +msgstr "[đã cài,có thể tự động gỡ bỏ]" #: apt-private/private-output.cc:207 msgid "[installed,automatic]" @@ -1416,9 +1424,9 @@ msgid "[installed]" msgstr "[đã cài đặt]" #: apt-private/private-output.cc:213 -#, fuzzy, c-format +#, c-format msgid "[upgradable from: %s]" -msgstr "[có thể nâng cấp từ: " +msgstr "[có thể nâng cấp từ: %s]" #: apt-private/private-output.cc:217 msgid "[residual-config]" @@ -1460,7 +1468,7 @@ msgstr " hay" #: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" -msgstr "Những gói MỚI sau sẽ được cài đặt:" +msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:" #: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" @@ -1480,7 +1488,7 @@ msgstr "Những gói sau đây sẽ bị HẠ CẤP:" #: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" -msgstr "Những gói sau đây sẽ được thay đổi:" +msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:" #: apt-private/private-output.cc:620 #, c-format @@ -1608,7 +1616,7 @@ msgstr "Tìm kiếm toàn văn" msgid "There is %lu additional record. Please use the '-a' switch to see it" msgid_plural "" "There are %lu additional records. Please use the '-a' switch to see them." -msgstr[0] "" +msgstr[0] "Ở đây có %lu bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem" #: apt-private/private-show.cc:159 msgid "not a real package (virtual)" @@ -1621,10 +1629,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" -"GHI CHÚ: đây chỉ là mô phỏng!\n" -" apt-get yêu cầu quyền root để thực hiện thật.\n" -" Cần nhớ rằng chức năng khóa đã bị tắt,\n" -" nên có thể nó không chính xác như những gì làm thật!" +"CHÚ Ý: đây chỉ là mô phỏng!\n" +" apt-get yêu cầu quyền root để thực hiện thật.\n" +" Cần nhớ rằng chức năng khóa đã bị tắt,\n" +" nên có thể nó không chính xác như những gì làm thật!" #: apt-private/private-sources.cc:45 #, c-format @@ -1697,19 +1705,19 @@ msgstr "Không thể chuyển đổi sang %s" #: methods/mirror.cc:280 #, c-format msgid "No mirror file '%s' found " -msgstr "Không tìm thấy tập tin nhân bản “%s” " +msgstr "Không tìm thấy tập tin bản sao “%s” " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:287 #, c-format msgid "Can not read mirror file '%s'" -msgstr "Không thể đọc tập tin mirror “%s”" +msgstr "Không thể đọc tập tin bản sao “%s”" #: methods/mirror.cc:315 #, c-format msgid "No entry found in mirror file '%s'" -msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”" +msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”" #: methods/mirror.cc:445 #, c-format @@ -1760,1845 +1768,1845 @@ msgstr "" msgid "Merging available information" msgstr "Đang hòa trộn các thông tin sẵn có..." -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s không phải là một gói DEB hợp lệ." +#: apt-inst/contrib/extracttar.cc:116 +msgid "Failed to create pipes" +msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" -#: cmdline/apt-extracttemplates.cc:234 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" -"\n" -"[extract: rút trích;\n" -"templates: mẫu]\n" -"\n" -"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" -"\tvà biểu mẫu đều từ gói Debian\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này\n" -" -t Đặt thư mục tạm thời\n" -" [t: viết tắt cho từ “temporary”: tạm thời]\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "Việc thực hiện gzip bị lỗi " + +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +msgid "Corrupted archive" +msgstr "Kho bị hỏng." + +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: apt-inst/contrib/extracttar.cc:300 #, c-format -msgid "Unable to write to %s" -msgstr "Không thể ghi vào %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" -#: cmdline/apt-extracttemplates.cc:308 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "Chữ ký kho không hợp lệ" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 -msgid "Package extension list is too long" -msgstr "Danh sách mở rộng gói quá dài" +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: apt-inst/contrib/arfile.cc:94 #, c-format -msgid "Error processing directory %s" -msgstr "Gặp lỗi khi xử lý thư mục %s" +msgid "Invalid archive member header %s" +msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" -#: ftparchive/apt-ftparchive.cc:262 -msgid "Source extension list is too long" -msgstr "Danh sách mở rộng nguồn quá dài" +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "Phần đầu thành viên kho không hợp lê" -#: ftparchive/apt-ftparchive.cc:379 -msgid "Error writing header to contents file" -msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" +#: apt-inst/contrib/arfile.cc:135 +msgid "Archive is too short" +msgstr "Kho quá ngắn" -#: ftparchive/apt-ftparchive.cc:409 -#, c-format -msgid "Error processing contents %s" -msgstr "Gặp lỗi khi xử lý nội dung %s" +#: apt-inst/contrib/arfile.cc:139 +msgid "Failed to read the archive headers" +msgstr "Việc đọc phần đầu kho bị lỗi" -#: ftparchive/apt-ftparchive.cc:597 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" -"\n" -"[ftparchive: FTP archive: kho FTP]\n" -"\n" -"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" -" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" -" contents path\n" -" release path\n" -" generate config [các_nhóm]\n" -" clean config\n" -"\n" -"(packages: những gói;\n" -"binarypath: đường dẫn nhị phân;\n" -"sources: những nguồn;\n" -"srcpath: đường dẫn nguồn;\n" -"contents path: đường dẫn nội dung;\n" -"release path: đường dẫn bản đã phát hành;\n" -"generate config [groups]: tạo ra cấu hình [các nhóm];\n" -"clean config: cấu hình toàn mới)\n" -"\n" -"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" -"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" -"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" -"và dpkg-scansources (dpkg-quét_nguồn).\n" -"\n" -"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" -"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" -"cùng với băm MD5 và kích cỡ tập tin.\n" -"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" -"\n" -"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" -"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" -"để ghi rõ tập tin đè nguồn\n" -"\n" -"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" -"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " -"quy,\n" -"và tập tin đè nên chứa những cờ đè.\n" -"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" -"những trường tên tập tin nếu có.\n" -"Cách sử dụng thí dụ từ kho Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Tùy chọn:\n" -" -h _Trợ giúp_ này\n" -" --md5 Điều khiển cách tạo ra MD5\n" -" -s=? Tập tin đè nguồn\n" -" -q _Im lặng_ (không xuất chi tiết)\n" -" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" -" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" -" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" -#: ftparchive/apt-ftparchive.cc:803 -msgid "No selections matched" -msgstr "Không có cái được chọn khớp được" +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "Gặp lỗi xác định vị trí phần tử băm!" -#: ftparchive/apt-ftparchive.cc:881 +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "Gặp lỗi khi xác định vị trí trệch đi" + +#: apt-inst/filelist.cc:466 +msgid "Internal error in AddDiversion" +msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" + +#: apt-inst/filelist.cc:479 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" -#: ftparchive/cachedb.cc:47 +#: apt-inst/filelist.cc:508 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." +msgid "Double add of diversion %s -> %s" +msgstr "Sự trệch đi được thêm hai lần %s → %s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/filelist.cc:551 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s" +msgid "Duplicate conf file %s/%s" +msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " -"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "Việc ghi tập tin %s gặp lỗi" -#: ftparchive/cachedb.cc:81 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." +msgid "Failed to close file %s" +msgstr "Việc đóng tập tin %s gặp lỗi" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format -msgid "Failed to stat %s" -msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" +msgid "The path %s is too long" +msgstr "Đường dẫn %s quá dài" -#: ftparchive/cachedb.cc:249 -msgid "Archive has no control record" -msgstr "Kho không có mục ghi điều khiển" +#: apt-inst/extract.cc:125 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Đang giải nén %s nhiều lần" -#: ftparchive/cachedb.cc:490 -msgid "Unable to get a cursor" -msgstr "Không thể lấy con trỏ" - -#: ftparchive/writer.cc:82 +#: apt-inst/extract.cc:135 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "CB: Không thể đọc thư mục %s\n" +msgid "The directory %s is diverted" +msgstr "Thư mục %s bị trệch hướng" -#: ftparchive/writer.cc:87 +#: apt-inst/extract.cc:145 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "CB: Không thể lấy thông tin thống kê %s\n" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: ftparchive/writer.cc:143 -msgid "E: " -msgstr "L: " +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +msgid "The diversion path is too long" +msgstr "Đường dẫn trệch đi quá dài" -#: ftparchive/writer.cc:145 -msgid "W: " -msgstr "CB: " +#: apt-inst/extract.cc:179 apt-inst/extract.cc:192 apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:127 +#, c-format +msgid "Failed to stat %s" +msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" -#: ftparchive/writer.cc:152 -msgid "E: Errors apply to file " -msgstr "LỖI: có lỗi áp dụng vào tập tin " +#: apt-inst/extract.cc:187 ftparchive/multicompress.cc:371 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Việc đổi tên %s thành %s bị lỗi" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: apt-inst/extract.cc:242 #, c-format -msgid "Failed to resolve %s" -msgstr "Gặp lỗi khi phân giải %s" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" -#: ftparchive/writer.cc:183 -msgid "Tree walking failed" -msgstr "Việc di chuyển qua cây bị lỗi" +#: apt-inst/extract.cc:282 +msgid "Failed to locate node in its hash bucket" +msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" -#: ftparchive/writer.cc:210 -#, c-format -msgid "Failed to open %s" -msgstr "Việc mở %s bị lỗi" +#: apt-inst/extract.cc:286 +msgid "The path is too long" +msgstr "Đường dẫn quá dài" -#: ftparchive/writer.cc:269 +#: apt-inst/extract.cc:414 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Bỏ liên kết %s [%s]\n" +msgid "Overwrite package match with no version for %s" +msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: ftparchive/writer.cc:277 +#: apt-inst/extract.cc:431 #, c-format -msgid "Failed to readlink %s" -msgstr "Gặp lỗi khi đọc liên kết %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" -#: ftparchive/writer.cc:281 +#: apt-inst/extract.cc:491 #, c-format -msgid "Failed to unlink %s" -msgstr "Việc bỏ liên kết %s bị lỗi" +msgid "Unable to stat %s" +msgstr "Không thể lấy thông tin thống kê %s" -#: ftparchive/writer.cc:289 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#: apt-inst/deb/debfile.cc:54 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Gặp lỗi khi liên kết %s đến %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" -#: ftparchive/writer.cc:299 +#: apt-inst/deb/debfile.cc:119 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Hết hạn bỏ liên kết của %sB.\n" +msgid "Internal error, could not locate member %s" +msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" -#: ftparchive/writer.cc:404 -msgid "Archive had no package field" -msgstr "Kho không có trường gói" +#: apt-inst/deb/debfile.cc:213 +msgid "Unparsable control file" +msgstr "Tập tin điều khiển không có khả năng phân tách" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s không có mục ghi đè (override)\n" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " người bảo trì %s là %s không phải %s\n" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Không thể nhân đôi bộ mô tả tập tin %i" -#: ftparchive/writer.cc:712 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s không có mục ghi đè (override) nguồn\n" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" -#: ftparchive/writer.cc:716 +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" + +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" + +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 -msgid "realloc - Failed to allocate memory" -msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Gặp lỗi khi cắt ngắn tập tin" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Unable to open %s" -msgstr "Không thể mở %s" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" +"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" +"Giá trị hiện thời là: %lu. (man 5 apt.conf)" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:65 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Sai override %s dòng %llu #1" +#: apt-pkg/contrib/mmap.cc:446 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " +"dùng tắt đi." + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:401 #, c-format -msgid "Failed to read the override file %s" -msgstr "Việc đọc tập tin đè %s bị lỗi" +msgid "%lid %lih %limin %lis" +msgstr "%li ngày %li giờ %li phút %li giây" -#: ftparchive/override.cc:163 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:408 #, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Sai override %s dòng %llu #1" +msgid "%lih %limin %lis" +msgstr "%li giờ %li phút %li giây" -#: ftparchive/override.cc:175 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:415 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Sai override %s dòng %llu #2" +msgid "%limin %lis" +msgstr "%li phút %li giây" -#: ftparchive/override.cc:188 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:420 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Sai override %s dòng %llu #3" +msgid "%lis" +msgstr "%li giây" -#: ftparchive/multicompress.cc:70 +#: apt-pkg/contrib/strutl.cc:1229 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Không biết thuật toán nén “%s”" +msgid "Selection %s not found" +msgstr "Không tìm thấy vùng chọn %s" -#: ftparchive/multicompress.cc:100 +#: apt-pkg/contrib/configuration.cc:503 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Không chấp nhận kiểu viết tắt: “%c”" -#: ftparchive/multicompress.cc:189 -msgid "Failed to create FILE*" -msgstr "Việc tạo TẬP_TIN* bị lỗi" +#: apt-pkg/contrib/configuration.cc:617 +#, c-format +msgid "Opening configuration file %s" +msgstr "Đang mở tập tin cấu hình %s..." -#: ftparchive/multicompress.cc:192 -msgid "Failed to fork" -msgstr "Gặp lỗi khi rẽ nhánh tiến trình" +#: apt-pkg/contrib/configuration.cc:785 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." -#: ftparchive/multicompress.cc:206 -msgid "Compress child" -msgstr "Nén con" +#: apt-pkg/contrib/configuration.cc:804 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" -#: ftparchive/multicompress.cc:229 +#: apt-pkg/contrib/configuration.cc:821 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" -#: ftparchive/multicompress.cc:302 -msgid "IO to subprocess/file failed" -msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" +#: apt-pkg/contrib/configuration.cc:861 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" -#: ftparchive/multicompress.cc:340 -msgid "Failed to read while computing MD5" -msgstr "Gặp lỗi khi đọc trong khi tính MD5" +#: apt-pkg/contrib/configuration.cc:868 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" -#: ftparchive/multicompress.cc:356 +#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Problem unlinking %s" -msgstr "Gặp lỗi khi bỏ liên kết %s" +msgid "Syntax error %s:%u: Included from here" +msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: apt-pkg/contrib/configuration.cc:881 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Việc đổi tên %s thành %s bị lỗi" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" -#: cmdline/apt-internal-solver.cc:38 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/contrib/configuration.cc:884 +#, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Cách dùng: apt-internal-solver\n" -"\n" -"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" -"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" -"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này.\n" -" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Không hiểu bản ghi gói!" +"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " +"số" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" -"\n" -"[sortpkgs: sort packages: sắp xếp các gói]\n" -"\n" -"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" -"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp_ này\n" -" -s Sắp xếp những tập tin _nguồn_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +#: apt-pkg/contrib/configuration.cc:934 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" -#: apt-inst/contrib/extracttar.cc:116 -msgid "Failed to create pipes" -msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" +#: apt-pkg/contrib/progress.cc:146 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Lỗi!" -#: apt-inst/contrib/extracttar.cc:143 -msgid "Failed to exec gzip " -msgstr "Việc thực hiện gzip bị lỗi " +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Xong" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 -msgid "Corrupted archive" -msgstr "Kho bị hỏng." +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "..." -#: apt-inst/contrib/extracttar.cc:195 -msgid "Tar checksum failed, archive corrupted" -msgstr "Lỗi kiểm tổng tar, kho bị hỏng" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-pkg/contrib/cmndline.cc:116 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." -#: apt-inst/contrib/arfile.cc:74 -msgid "Invalid archive signature" -msgstr "Chữ ký kho không hợp lệ" +#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 +#: apt-pkg/contrib/cmndline.cc:158 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Không hiểu tùy chọn dòng lệnh %s" -#: apt-inst/contrib/arfile.cc:82 -msgid "Error reading archive member header" -msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" +#: apt-pkg/contrib/cmndline.cc:163 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" -#: apt-inst/contrib/arfile.cc:94 +#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 #, c-format -msgid "Invalid archive member header %s" -msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" +msgid "Option %s requires an argument." +msgstr "Tùy chọn %s yêu cầu một đối số." -#: apt-inst/contrib/arfile.cc:106 -msgid "Invalid archive member header" -msgstr "Phần đầu thành viên kho không hợp lê" +#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#, c-format +msgid "Option %s: Configuration item specification must have an =<val>." +msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”." -#: apt-inst/contrib/arfile.cc:135 -msgid "Archive is too short" -msgstr "Kho quá ngắn" +#: apt-pkg/contrib/cmndline.cc:273 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" -#: apt-inst/contrib/arfile.cc:139 -msgid "Failed to read the archive headers" -msgstr "Việc đọc phần đầu kho bị lỗi" +#: apt-pkg/contrib/cmndline.cc:304 +#, c-format +msgid "Option '%s' is too long" +msgstr "Tùy chọn “%s” quá dài" -#: apt-inst/filelist.cc:382 -msgid "DropNode called on still linked node" -msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" +#: apt-pkg/contrib/cmndline.cc:336 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." -#: apt-inst/filelist.cc:414 -msgid "Failed to locate the hash element!" -msgstr "Gặp lỗi xác định vị trí phần tử băm!" +#: apt-pkg/contrib/cmndline.cc:386 +#, c-format +msgid "Invalid operation %s" +msgstr "Thao tác “%s” không hợp lệ" -#: apt-inst/filelist.cc:461 -msgid "Failed to allocate diversion" -msgstr "Gặp lỗi khi xác định vị trí trệch đi" +#: apt-pkg/contrib/cdromutl.cc:56 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-inst/filelist.cc:466 -msgid "Internal error in AddDiversion" -msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" +#: apt-pkg/contrib/cdromutl.cc:225 +msgid "Failed to stat the cdrom" +msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" -#: apt-inst/filelist.cc:479 +#: apt-pkg/contrib/fileutl.cc:95 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" +msgid "Problem closing the gzip file %s" +msgstr "Gặp vấn đề khi đóng tập tin gzip %s" -#: apt-inst/filelist.cc:508 +#: apt-pkg/contrib/fileutl.cc:228 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Sự trệch đi được thêm hai lần %s → %s" +msgid "Not using locking for read only lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-inst/filelist.cc:551 +#: apt-pkg/contrib/fileutl.cc:233 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" +msgid "Could not open lock file %s" +msgstr "Không thể mở tập tin khóa %s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/contrib/fileutl.cc:256 #, c-format -msgid "Failed to write file %s" -msgstr "Việc ghi tập tin %s gặp lỗi" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/contrib/fileutl.cc:261 #, c-format -msgid "Failed to close file %s" -msgstr "Việc đóng tập tin %s gặp lỗi" +msgid "Could not get lock %s" +msgstr "Không thể lấy khóa %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 #, c-format -msgid "The path %s is too long" -msgstr "Đường dẫn %s quá dài" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" -#: apt-inst/extract.cc:125 +#: apt-pkg/contrib/fileutl.cc:432 #, c-format -msgid "Unpacking %s more than once" -msgstr "Đang giải nén %s nhiều lần" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" -#: apt-inst/extract.cc:135 +#: apt-pkg/contrib/fileutl.cc:450 #, c-format -msgid "The directory %s is diverted" -msgstr "Thư mục %s bị trệch hướng" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" -#: apt-inst/extract.cc:145 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" - -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 -msgid "The diversion path is too long" -msgstr "Đường dẫn trệch đi quá dài" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " +"lệ" -#: apt-inst/extract.cc:242 +#: apt-pkg/contrib/fileutl.cc:862 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" - -#: apt-inst/extract.cc:282 -msgid "Failed to locate node in its hash bucket" -msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" - -#: apt-inst/extract.cc:286 -msgid "The path is too long" -msgstr "Đường dẫn quá dài" +msgid "Sub-process %s received a segmentation fault." +msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." -#: apt-inst/extract.cc:414 +#: apt-pkg/contrib/fileutl.cc:864 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" +msgid "Sub-process %s received signal %u." +msgstr "Tiến trình con %s đã nhận tín hiệu %u." -#: apt-inst/extract.cc:431 +#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" -#: apt-inst/extract.cc:491 +#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 #, c-format -msgid "Unable to stat %s" -msgstr "Không thể lấy thông tin thống kê %s" +msgid "Sub-process %s exited unexpectedly" +msgstr "Tiến trình con %s đã thoát bất thường" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-pkg/contrib/fileutl.cc:1016 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" +msgid "Could not open file %s" +msgstr "Không thể mở tập tin %s" -#: apt-inst/deb/debfile.cc:119 +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" +msgid "Could not open file descriptor %d" +msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-inst/deb/debfile.cc:213 -msgid "Unparsable control file" -msgstr "Tập tin điều khiển không có khả năng phân tách" +#: apt-pkg/contrib/fileutl.cc:1178 +msgid "Failed to create subprocess IPC" +msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" +#: apt-pkg/contrib/fileutl.cc:1233 +msgid "Failed to exec compressor " +msgstr "Gặp lỗi khi thực hiện nén " -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/contrib/fileutl.cc:1326 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Không thể nhân đôi bộ mô tả tập tin %i" +msgid "read, still have %llu to read but none left" +msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" +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/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" +#: apt-pkg/contrib/fileutl.cc:1726 +#, c-format +msgid "Problem closing the file %s" +msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" +#: apt-pkg/contrib/fileutl.cc:1738 +#, 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/mmap.cc:290 +#: apt-pkg/contrib/fileutl.cc:1749 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" +msgid "Problem unlinking the file %s" +msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Gặp lỗi khi cắt ngắn tập tin" +#: apt-pkg/contrib/fileutl.cc:1762 +msgid "Problem syncing the file" +msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" -#: apt-pkg/contrib/mmap.cc:341 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:70 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" -"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" -"Giá trị hiện thời là: %lu. (man 5 apt.conf)" +msgid "No keyring installed in %s." +msgstr "Không có vòng khoá nào được cài đặt vào %s." -#: apt-pkg/contrib/mmap.cc:446 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." +#: apt-pkg/pkgcache.cc:148 +msgid "Empty package cache" +msgstr "Bộ nhớ tạm gói trống" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " -"dùng tắt đi." +#: apt-pkg/pkgcache.cc:154 +msgid "The package cache file is corrupted" +msgstr "Tập tin nhớ tạm gói bị hỏng" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li ngày %li giờ %li phút %li giây" +#: apt-pkg/pkgcache.cc:159 +msgid "The package cache file is an incompatible version" +msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 -#, c-format -msgid "%lih %limin %lis" -msgstr "%li giờ %li phút %li giây" +#: apt-pkg/pkgcache.cc:162 +msgid "The package cache file is corrupted, it is too small" +msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/pkgcache.cc:167 #, c-format -msgid "%limin %lis" -msgstr "%li phút %li giây" +msgid "This APT does not support the versioning system '%s'" +msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:420 -#, c-format -msgid "%lis" -msgstr "%li giây" +#: apt-pkg/pkgcache.cc:172 +msgid "The package cache was built for a different architecture" +msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" -#: apt-pkg/contrib/strutl.cc:1229 -#, c-format -msgid "Selection %s not found" -msgstr "Không tìm thấy vùng chọn %s" +#: apt-pkg/pkgcache.cc:314 +msgid "Depends" +msgstr "Phụ thuộc" -#: apt-pkg/contrib/configuration.cc:503 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Không chấp nhận kiểu viết tắt: “%c”" +#: apt-pkg/pkgcache.cc:314 +msgid "PreDepends" +msgstr "Phụ thuộc sẵn" -#: apt-pkg/contrib/configuration.cc:617 -#, c-format -msgid "Opening configuration file %s" -msgstr "Đang mở tập tin cấu hình %s..." +#: apt-pkg/pkgcache.cc:314 +msgid "Suggests" +msgstr "Đề nghị" -#: apt-pkg/contrib/configuration.cc:785 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." +#: apt-pkg/pkgcache.cc:315 +msgid "Recommends" +msgstr "Khuyến khích" -#: apt-pkg/contrib/configuration.cc:804 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" +#: apt-pkg/pkgcache.cc:315 +msgid "Conflicts" +msgstr "Xung đột" -#: apt-pkg/contrib/configuration.cc:821 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" +#: apt-pkg/pkgcache.cc:315 +msgid "Replaces" +msgstr "Thay thế" -#: apt-pkg/contrib/configuration.cc:861 -#, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" +#: apt-pkg/pkgcache.cc:316 +msgid "Obsoletes" +msgstr "Cũ" -#: apt-pkg/contrib/configuration.cc:868 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" +#: apt-pkg/pkgcache.cc:316 +msgid "Breaks" +msgstr "Làm hỏng" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" +#: apt-pkg/pkgcache.cc:316 +msgid "Enhances" +msgstr "Tăng cường" -#: apt-pkg/contrib/configuration.cc:881 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" +#: apt-pkg/pkgcache.cc:327 +msgid "important" +msgstr "quan trọng" -#: apt-pkg/contrib/configuration.cc:884 -#, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" -"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " -"số" +#: apt-pkg/pkgcache.cc:327 +msgid "required" +msgstr "yêu cầu" -#: apt-pkg/contrib/configuration.cc:934 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" +#: apt-pkg/pkgcache.cc:327 +msgid "standard" +msgstr "chuẩn" -#: apt-pkg/contrib/progress.cc:146 -#, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Lỗi!" +#: apt-pkg/pkgcache.cc:328 +msgid "optional" +msgstr "tùy chọn" -#: apt-pkg/contrib/progress.cc:148 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Xong" +#: apt-pkg/pkgcache.cc:328 +msgid "extra" +msgstr "bổ sung" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "..." +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +msgid "Building dependency tree" +msgstr "Đang xây dựng cây quan hệ phụ thuộc" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +#: apt-pkg/depcache.cc:133 +msgid "Candidate versions" +msgstr "Phiên bản ứng cử" -#: apt-pkg/contrib/cmndline.cc:116 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." +#: apt-pkg/depcache.cc:162 +msgid "Dependency generation" +msgstr "Tạo ra quan hệ phụ thuộc" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Không hiểu tùy chọn dòng lệnh %s" +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +msgid "Reading state information" +msgstr "Đang đọc thông tin về tình trạng" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/depcache.cc:244 #, c-format -msgid "Command line option %s is not boolean" -msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" +msgid "Failed to open StateFile %s" +msgstr "Lỗi mở tập tin tình trạng StateFile %s" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/depcache.cc:250 #, c-format -msgid "Option %s requires an argument." -msgstr "Tùy chọn %s yêu cầu một đối số." +msgid "Failed to write temporary StateFile %s" +msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/tagfile.cc:138 #, c-format -msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”." +msgid "Unable to parse package file %s (1)" +msgstr "Không thể phân tích tập tin gói %s (1)" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/tagfile.cc:235 #, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" +msgid "Unable to parse package file %s (2)" +msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/sourcelist.cc:118 #, c-format -msgid "Option '%s' is too long" -msgstr "Tùy chọn “%s” quá dài" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/sourcelist.cc:161 #, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " +"tích được)" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/sourcelist.cc:164 #, c-format -msgid "Invalid operation %s" -msgstr "Thao tác “%s” không hợp lệ" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/sourcelist.cc:175 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " +"gán)" -#: apt-pkg/contrib/cdromutl.cc:225 -msgid "Failed to stat the cdrom" -msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" +#: apt-pkg/sourcelist.cc:181 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/contrib/fileutl.cc:95 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gặp vấn đề khi đóng tập tin gzip %s" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " +"trị)" -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/sourcelist.cc:197 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/sourcelist.cc:199 #, c-format -msgid "Could not open lock file %s" -msgstr "Không thể mở tập tin khóa %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/sourcelist.cc:202 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Could not get lock %s" -msgstr "Không thể lấy khóa %s" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/sourcelist.cc:215 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/sourcelist.cc:326 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" +msgid "Opening %s" +msgstr "Đang mở %s" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" +msgid "Line %u too long in source list %s." +msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/sourcelist.cc:362 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " -"lệ" +msgid "Malformed line %u in source list %s (type)" +msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/sourcelist.cc:366 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/sourcelist.cc:407 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Tiến trình con %s đã nhận tín hiệu %u." +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." +"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Tiến trình con %s đã thoát bất thường" +msgid "Could not configure '%s'. " +msgstr "Không thể cấu hình “%s”. " -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/packagemanager.cc:570 #, c-format -msgid "Could not open file %s" -msgstr "Không thể mở tập tin %s" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " +"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " +"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" +"LoopBreak” (buộc ngắt vòng lặp)." -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/pkgrecords.cc:34 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Không thể mở bộ mô tả tập tin %d" +msgid "Index file type '%s' is not supported" +msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" -#: apt-pkg/contrib/fileutl.cc:1178 -msgid "Failed to create subprocess IPC" -msgstr "Việc tạo tiến trình con IPC bị lỗi" +#: apt-pkg/algorithms.cc:266 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/contrib/fileutl.cc:1233 -msgid "Failed to exec compressor " -msgstr "Gặp lỗi khi thực hiện nén " +#: apt-pkg/algorithms.cc:1068 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " +"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/contrib/fileutl.cc:1326 -#, c-format -msgid "read, still have %llu to read but none left" -msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" +#: apt-pkg/algorithms.cc:1070 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "ghi, còn cần ghi %llu nhưng mà không thể" +msgid "List directory %spartial is missing." +msgstr "Thiếu thư mục danh sách %spartial." -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/acquire.cc:85 #, c-format -msgid "Problem closing the file %s" -msgstr "Gặp vấn đề khi đóng tập tin %s" +msgid "Archives directory %spartial is missing." +msgstr "Thiếu thư mục kho lưu %spartial." -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/acquire.cc:93 #, 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" +msgid "Unable to lock directory %s" +msgstr "Không thể khoá thư mục %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:893 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" -#: apt-pkg/contrib/fileutl.cc:1762 -msgid "Problem syncing the file" -msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" +#: apt-pkg/acquire.cc:895 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Đang tải tập tin %li trong tổng số %li" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/acquire-worker.cc:112 #, c-format -msgid "No keyring installed in %s." -msgstr "Không có vòng khoá nào được cài đặt vào %s." +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/pkgcache.cc:148 -msgid "Empty package cache" -msgstr "Bộ nhớ tạm gói trống" +#: apt-pkg/acquire-worker.cc:161 +#, 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/pkgcache.cc:154 -msgid "The package cache file is corrupted" -msgstr "Tập tin nhớ tạm gói bị hỏng" +#: apt-pkg/acquire-worker.cc:447 +#, 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." -#: apt-pkg/pkgcache.cc:159 -msgid "The package cache file is an incompatible version" -msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" +#: apt-pkg/init.cc:143 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Không hỗ trợ hệ thống đóng gói “%s”" -#: apt-pkg/pkgcache.cc:162 -msgid "The package cache file is corrupted, it is too small" -msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" +#: apt-pkg/init.cc:159 +msgid "Unable to determine a suitable packaging system type" +msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/clean.cc:57 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" +msgid "Unable to stat %s." +msgstr "Không thể lấy trạng thái về %s." -#: apt-pkg/pkgcache.cc:172 -msgid "The package cache was built for a different architecture" -msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" - -#: apt-pkg/pkgcache.cc:314 -msgid "Depends" -msgstr "Phụ thuộc" +#: apt-pkg/srcrecords.cc:47 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" +"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" -#: apt-pkg/pkgcache.cc:314 -msgid "PreDepends" -msgstr "Phụ thuộc sẵn" +#: apt-pkg/cachefile.cc:87 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." -#: apt-pkg/pkgcache.cc:314 -msgid "Suggests" -msgstr "Đề nghị" +#: apt-pkg/cachefile.cc:91 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " +"này" -#: apt-pkg/pkgcache.cc:315 -msgid "Recommends" -msgstr "Khuyến khích" +#: apt-pkg/cachefile.cc:109 +msgid "The list of sources could not be read." +msgstr "Không thể đọc danh sách nguồn." -#: apt-pkg/pkgcache.cc:315 -msgid "Conflicts" -msgstr "Xung đột" +#: apt-pkg/policy.cc:75 +#, c-format +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " +"không sẵn có trong mã nguồn" -#: apt-pkg/pkgcache.cc:315 -msgid "Replaces" -msgstr "Thay thế" +#: apt-pkg/policy.cc:414 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." -#: apt-pkg/pkgcache.cc:316 -msgid "Obsoletes" -msgstr "Cũ" +#: apt-pkg/policy.cc:436 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/pkgcache.cc:316 -msgid "Breaks" -msgstr "Làm hỏng" +#: apt-pkg/policy.cc:444 +msgid "No priority (or zero) specified for pin" +msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/pkgcache.cc:316 -msgid "Enhances" -msgstr "Tăng cường" +#: apt-pkg/pkgcachegen.cc:87 +msgid "Cache has an incompatible versioning system" +msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" -#: apt-pkg/pkgcache.cc:327 -msgid "important" -msgstr "quan trọng" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" -#: apt-pkg/pkgcache.cc:327 -msgid "required" -msgstr "yêu cầu" +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/pkgcache.cc:327 -msgid "standard" -msgstr "chuẩn" +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/pkgcache.cc:328 -msgid "optional" -msgstr "tùy chọn" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." -#: apt-pkg/pkgcache.cc:328 -msgid "extra" -msgstr "bổ sung" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 -msgid "Building dependency tree" -msgstr "Đang xây dựng cây quan hệ phụ thuộc" +#: apt-pkg/pkgcachegen.cc:570 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/depcache.cc:133 -msgid "Candidate versions" -msgstr "Phiên bản ứng cử" +#: apt-pkg/pkgcachegen.cc:1199 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/depcache.cc:162 -msgid "Dependency generation" -msgstr "Tạo ra quan hệ phụ thuộc" +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +msgid "Reading package lists" +msgstr "Đang đọc các danh sách gói" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 -msgid "Reading state information" -msgstr "Đang đọc thông tin về tình trạng" +#: apt-pkg/pkgcachegen.cc:1304 +msgid "Collecting File Provides" +msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/pkgcachegen.cc:1388 cmdline/apt-extracttemplates.cc:266 #, c-format -msgid "Failed to open StateFile %s" -msgstr "Lỗi mở tập tin tình trạng StateFile %s" +msgid "Unable to write to %s" +msgstr "Không thể ghi vào %s" -#: apt-pkg/depcache.cc:250 -#, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +msgid "IO Error saving source cache" +msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/acquire-item.cc:139 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Không thể phân tích tập tin gói %s (1)" +msgid "rename failed, %s (%s -> %s)." +msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." -#: apt-pkg/tagfile.cc:235 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Không thể phân tích tập tin gói %s (2)" +#: apt-pkg/acquire-item.cc:154 +msgid "Hash Sum mismatch" +msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" -#: apt-pkg/sourcelist.cc:118 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" +#: apt-pkg/acquire-item.cc:159 +msgid "Size mismatch" +msgstr "Kích cỡ không khớp nhau" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/acquire-item.cc:164 +msgid "Invalid file format" +msgstr "Định dạng tập tập tin không hợp lệ" + +#: apt-pkg/acquire-item.cc:1561 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" msgstr "" -"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " -"tích được)" +"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " +"sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/acquire-item.cc:1577 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/acquire-item.cc:1619 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" + +#: apt-pkg/acquire-item.cc:1657 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " -"gán)" +"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " +"này sẽ không được áp dụng." -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/acquire-item.cc:1679 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/acquire-item.cc:1709 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "" +"An error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " -"trị)" +"Gặp lỗi trong khi thẩm tra chữ ký.\n" +"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" +"Lỗi GPG: %s: %s\n" -#: apt-pkg/sourcelist.cc:197 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" +msgid "GPG error: %s: %s" +msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/acquire-item.cc:1847 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " +"này, do thiếu kiến trúc." -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/acquire-item.cc:1913 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/acquire-item.cc:1971 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" +"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " +"tin:) cho gói %s." -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/indexrecords.cc:73 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" +msgid "Unable to parse Release file %s" +msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/indexrecords.cc:81 #, c-format -msgid "Opening %s" -msgstr "Đang mở %s" +msgid "No sections in Release file %s" +msgstr "Không có phần nào trong tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/indexrecords.cc:112 #, c-format -msgid "Line %u too long in source list %s." -msgstr "Dòng %u quá dài trong danh sách nguồn %s." +msgid "No Hash entry in Release file %s" +msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/indexrecords.cc:125 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "" +"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " +"hành %s" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/indexrecords.cc:144 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." +msgid "Invalid 'Date' entry in Release file %s" +msgstr "" +"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:407 -#, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." +#: apt-pkg/vendorlist.cc:78 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Khối nhà bán %s không chứa vân tay" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/cdrom.cc:576 #, c-format msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" msgstr "" -"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." -"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" +"Đang dùng thư mục gắn đĩa CD-ROM %s\n" +"Đang gắn đĩa CD-ROM...\n" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 -#, c-format -msgid "Could not configure '%s'. " -msgstr "Không thể cấu hình “%s”. " +#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 +msgid "Identifying.. " +msgstr "Đang nhận diện... " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/cdrom.cc:613 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " -"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " -"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" -"LoopBreak” (buộc ngắt vòng lặp)." +msgid "Stored label: %s\n" +msgstr "Nhãn đã lưu: %s\n" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 +msgid "Unmounting CD-ROM...\n" +msgstr "Đang bỏ gắn CD-ROM...\n" + +#: apt-pkg/cdrom.cc:642 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" +msgid "Using CD-ROM mount point %s\n" +msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/cdrom.cc:660 +msgid "Unmounting CD-ROM\n" +msgstr "Đang bỏ gắn CD-ROM...\n" + +#: apt-pkg/cdrom.cc:665 +msgid "Waiting for disc...\n" +msgstr "Đang đợi đĩa...\n" + +#: apt-pkg/cdrom.cc:674 +msgid "Mounting CD-ROM...\n" +msgstr "Đang gắn đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:693 +msgid "Scanning disc for index files..\n" +msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" + +#: apt-pkg/cdrom.cc:744 #, c-format msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/cdrom.cc:755 msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" msgstr "" -"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " -"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." - -#: apt-pkg/algorithms.cc:1070 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." +"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " +"hoặc có kiến trúc không đúng?" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:782 #, c-format -msgid "List directory %spartial is missing." -msgstr "Thiếu thư mục danh sách %spartial." +msgid "Found label '%s'\n" +msgstr "Tìm thấy nhãn “%s”\n" -#: apt-pkg/acquire.cc:85 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Thiếu thư mục kho lưu %spartial." +#: apt-pkg/cdrom.cc:811 +msgid "That is not a valid name, try again.\n" +msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/cdrom.cc:828 #, c-format -msgid "Unable to lock directory %s" -msgstr "Không thể khoá thư mục %s" +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Tên đĩa này:\n" +"“%s”\n" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:893 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" +#: apt-pkg/cdrom.cc:830 +msgid "Copying package lists..." +msgstr "Đang sao chép các danh sách gói..." -#: apt-pkg/acquire.cc:895 +#: apt-pkg/cdrom.cc:865 +msgid "Writing new source list\n" +msgstr "Đang ghi danh sách nguồn mới\n" + +#: apt-pkg/cdrom.cc:873 +msgid "Source list entries for this disc are:\n" +msgstr "Các mục tin danh sách nguồn cho đĩa này:\n" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Đang tải tập tin %li trong tổng số %li" +msgid "Wrote %i records.\n" +msgstr "Đã ghi %i bản ghi.\n" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, 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." +msgid "Wrote %i records with %i missing files.\n" +msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format -msgid "Method %s did not start correctly" -msgstr "Phương thức %s đã không khởi chạy đúng đắn." +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, 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." +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " +"nhau\n" -#: apt-pkg/init.cc:143 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Không hỗ trợ hệ thống đóng gói “%s”" +msgid "Can't find authentication record for: %s" +msgstr "Không tìm thấy bản ghi xác thực cho: %s" -#: apt-pkg/init.cc:159 -msgid "Unable to determine a suitable packaging system type" -msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" +#: apt-pkg/indexcopy.cc:521 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "Sai khớp chuỗi duy nhất cho: %s" -#: apt-pkg/clean.cc:57 +#: apt-pkg/cacheset.cc:469 #, c-format -msgid "Unable to stat %s." -msgstr "Không thể lấy trạng thái về %s." +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/srcrecords.cc:47 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" +#: apt-pkg/cacheset.cc:472 +#, 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/cachefile.cc:87 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." +#: apt-pkg/cacheset.cc:583 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Không tìm thấy tác vụ “%s”" -#: apt-pkg/cachefile.cc:91 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " -"này" +#: apt-pkg/cacheset.cc:589 +#, 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/cachefile.cc:109 -msgid "The list of sources could not be read." -msgstr "Không thể đọc danh sách nguồn." +#: apt-pkg/cacheset.cc:600 +#, 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/policy.cc:75 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " -"không sẵn có trong mã nguồn" +"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/policy.cc:414 +#: apt-pkg/cacheset.cc:621 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" -"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." +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/policy.cc:436 +#: apt-pkg/cacheset.cc:629 #, c-format -msgid "Did not understand pin type %s" -msgstr "Không hiểu kiểu ghim %s" - -#: apt-pkg/policy.cc:444 -msgid "No priority (or zero) specified for pin" -msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" +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/pkgcachegen.cc:87 -msgid "Cache has an incompatible versioning system" -msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" - -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/cacheset.cc:637 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" - -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." - -#: apt-pkg/pkgcachegen.cc:254 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " +"đặt" -#: apt-pkg/pkgcachegen.cc:570 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "Gửi kịch bản đến bộ phân giải" -#: apt-pkg/pkgcachegen.cc:1199 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" +#: apt-pkg/edsp.cc:209 +msgid "Send request to solver" +msgstr "Gửi yêu cầu đến bộ phân giải" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 -msgid "Reading package lists" -msgstr "Đang đọc các danh sách gói" +#: apt-pkg/edsp.cc:279 +msgid "Prepare for receiving solution" +msgstr "Chuẩn bị để lấy cách giải quyết" -#: apt-pkg/pkgcachegen.cc:1304 -msgid "Collecting File Provides" -msgstr "Đang tập hợp các Nhà cung cấp Tập tin" +#: apt-pkg/edsp.cc:286 +msgid "External solver failed without a proper error message" +msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 -msgid "IO Error saving source cache" -msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +msgid "Execute external solver" +msgstr "Thi hành bộ phân giải từ bên ngoài" -#: apt-pkg/acquire-item.cc:139 +#: apt-pkg/install-progress.cc:51 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." - -#: apt-pkg/acquire-item.cc:154 -msgid "Hash Sum mismatch" -msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" - -#: apt-pkg/acquire-item.cc:159 -msgid "Size mismatch" -msgstr "Kích cỡ không khớp nhau" +msgid "Progress: [%3i%%]" +msgstr "Diễn biến: [%3i%%]" -#: apt-pkg/acquire-item.cc:164 -msgid "Invalid file format" -msgstr "Định dạng tập tập tin không hợp lệ" +#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +msgid "Running dpkg" +msgstr "Đang chạy dpkg" -#: apt-pkg/acquire-item.cc:1561 -#, c-format +#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." msgstr "" -"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " -"sources.list hoặc tập tin bị hỏng)" +"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " +"được dùng thay thế." -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/deb/dpkgpm.cc:91 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" - -#: apt-pkg/acquire-item.cc:1619 -msgid "There is no public key available for the following key IDs:\n" -msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" +msgid "Installing %s" +msgstr "Đang cài đặt %s" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " -"này sẽ không được áp dụng." +msgid "Configuring %s" +msgstr "Đang cấu hình %s" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/deb/dpkgpm.cc:94 #, c-format -msgid "" -"An error occurred during the signature verification. The repository is not " -"updated and the previous index files will be used. GPG error: %s: %s\n" -msgstr "" -"Gặp lỗi trong khi thẩm tra chữ ký.\n" -"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" -"Lỗi GPG: %s: %s\n" +msgid "Completely removing %s" +msgstr "Đang gỡ bỏ hoàn toàn %s" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format -msgid "GPG error: %s: %s" -msgstr "Lỗi GPG: %s: %s" +msgid "Noting disappearance of %s" +msgstr "Đang ghi chép sự biến mất của %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/deb/dpkgpm.cc:96 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" -msgstr "" -"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " -"này, do thiếu kiến trúc." +msgid "Running post-installation trigger %s" +msgstr "Đang chạy bẫy sau-cài-đặt %s" -#: apt-pkg/acquire-item.cc:1913 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" +msgid "Directory '%s' missing" +msgstr "Thiếu thư mục “%s”" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "" -"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " -"tin:) cho gói %s." +msgid "Could not open file '%s'" +msgstr "Không thể mở tập tin “%s”" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format -msgid "Unable to parse Release file %s" -msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" +msgid "Preparing %s" +msgstr "Đang chuẩn bị %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format -msgid "No sections in Release file %s" -msgstr "Không có phần nào trong tập tin Phát hành %s" +msgid "Unpacking %s" +msgstr "Đang mở gói %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" +msgid "Preparing to configure %s" +msgstr "Đang chuẩn bị cấu hình %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "" -"Gặp mục nhập “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " -"hành %s" +msgid "Installed %s" +msgstr "Đã cài đặt %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "" -"Gặp mục nhập “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" +msgid "Preparing for removal of %s" +msgstr "Đang chuẩn bị gỡ bỏ %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Khối nhà bán %s không chứa vân tay" +msgid "Removed %s" +msgstr "Đã gỡ bỏ %s" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Đang dùng thư mục gắn đĩa CD-ROM %s\n" -"Đang gắn đĩa CD-ROM...\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Đang nhận diện... " +msgid "Preparing to completely remove %s" +msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: apt-pkg/cdrom.cc:613 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format -msgid "Stored label: %s\n" -msgstr "Nhãn đã lưu: %s\n" +msgid "Completely removed %s" +msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Đang bỏ gắn CD-ROM...\n" +#: apt-pkg/deb/dpkgpm.cc:1046 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "ioctl(TIOCGWINSZ) gặp lỗi" -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" +msgid "Can not write log (%s)" +msgstr "Không thể ghi nhật ký (%s)" -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" -msgstr "Đang bỏ gắn CD-ROM...\n" +#: apt-pkg/deb/dpkgpm.cc:1049 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts đã gắn chưa?" -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" -msgstr "Đang đợi đĩa...\n" +#: apt-pkg/deb/dpkgpm.cc:1070 +msgid "Is stdout a terminal?" +msgstr "Đầu ra là thiết bị cuối?" -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "Đang gắn đĩa CD-ROM...\n" +#: apt-pkg/deb/dpkgpm.cc:1558 +msgid "Operation was interrupted before it could finish" +msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/cdrom.cc:693 -msgid "Scanning disc for index files..\n" -msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" +#: apt-pkg/deb/dpkgpm.cc:1620 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" -#: apt-pkg/cdrom.cc:744 -#, c-format +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1625 +msgid "dependency problems - leaving unconfigured" +msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" + +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " +"do một sự thất bại trước đó." -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " -"hoặc có kiến trúc không đúng?" - -#: apt-pkg/cdrom.cc:782 -#, c-format -msgid "Found label '%s'\n" -msgstr "Tìm thấy nhãn “%s”\n" - -#: apt-pkg/cdrom.cc:811 -msgid "That is not a valid name, try again.\n" -msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/cdrom.cc:828 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" -"This disc is called: \n" -"'%s'\n" +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -"Tên đĩa này:\n" -"“%s”\n" - -#: apt-pkg/cdrom.cc:830 -msgid "Copying package lists..." -msgstr "Đang sao chép các danh sách gói..." - -#: apt-pkg/cdrom.cc:865 -msgid "Writing new source list\n" -msgstr "Đang ghi danh sách nguồn mới\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " +"bộ nhớ”" -#: apt-pkg/cdrom.cc:873 -msgid "Source list entries for this disc are:\n" -msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " +"thống nội bộ" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Đã ghi %i bản ghi.\n" +#: apt-pkg/deb/dpkgpm.cc:1674 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/deb/debsystem.cc:84 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " +"phải không?" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/deb/debsystem.cc:87 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:103 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " -"nhau\n" +"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " +"vấn đề này. " -#: apt-pkg/indexcopy.cc:515 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "Không tìm thấy bản ghi xác thực cho: %s" +#: apt-pkg/deb/debsystem.cc:121 +msgid "Not locked" +msgstr "Chưa được khoá" -#: apt-pkg/indexcopy.cc:521 +#: cmdline/apt-extracttemplates.cc:100 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Sai khớp chuỗi duy nhất cho: %s" +msgid "%s not a valid DEB package." +msgstr "%s không phải là một gói DEB hợp lệ." -#: apt-pkg/cacheset.cc:469 -#, 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”" +#: cmdline/apt-extracttemplates.cc:234 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" +"\n" +"[extract: rút trích;\n" +"templates: mẫu]\n" +"\n" +"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" +"\tvà biểu mẫu đều từ gói Debian\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này\n" +" -t Đặt thư mục tạm thời\n" +" [t: viết tắt cho từ “temporary”: tạm thời]\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-pkg/cacheset.cc:472 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Không tìm thấy phiên bản “%s” cho “%s”" +#: cmdline/apt-extracttemplates.cc:308 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: apt-pkg/cacheset.cc:583 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Không tìm thấy tác vụ “%s”" +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +msgid "Package extension list is too long" +msgstr "Danh sách mở rộng gói quá dài" -#: apt-pkg/cacheset.cc:589 +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, 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”" +msgid "Error processing directory %s" +msgstr "Gặp lỗi khi xử lý thư mục %s" -#: apt-pkg/cacheset.cc:600 -#, 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" +#: ftparchive/apt-ftparchive.cc:262 +msgid "Source extension list is too long" +msgstr "Danh sách mở rộng nguồn quá dài" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: ftparchive/apt-ftparchive.cc:379 +msgid "Error writing header to contents file" +msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" + +#: ftparchive/apt-ftparchive.cc:409 #, c-format +msgid "Error processing contents %s" +msgstr "Gặp lỗi khi xử lý nội dung %s" + +#: ftparchive/apt-ftparchive.cc:597 msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" 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ó" +"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" +"\n" +"[ftparchive: FTP archive: kho FTP]\n" +"\n" +"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" +" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" +" contents path\n" +" release path\n" +" generate config [các_nhóm]\n" +" clean config\n" +"\n" +"(packages: những gói;\n" +"binarypath: đường dẫn nhị phân;\n" +"sources: những nguồn;\n" +"srcpath: đường dẫn nguồn;\n" +"contents path: đường dẫn nội dung;\n" +"release path: đường dẫn bản đã phát hành;\n" +"generate config [groups]: tạo ra cấu hình [các nhóm];\n" +"clean config: cấu hình toàn mới)\n" +"\n" +"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" +"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" +"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" +"và dpkg-scansources (dpkg-quét_nguồn).\n" +"\n" +"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" +"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" +"cùng với băm MD5 và kích cỡ tập tin.\n" +"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" +"\n" +"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" +"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" +"để ghi rõ tập tin đè nguồn\n" +"\n" +"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" +"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " +"quy,\n" +"và tập tin đè nên chứa những cờ đè.\n" +"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" +"những trường tên tập tin nếu có.\n" +"Cách sử dụng thí dụ từ kho Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Tùy chọn:\n" +" -h _Trợ giúp_ này\n" +" --md5 Điều khiển cách tạo ra MD5\n" +" -s=? Tập tin đè nguồn\n" +" -q _Im lặng_ (không xuất chi tiết)\n" +" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" +" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" +" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" -#: apt-pkg/cacheset.cc:621 +#: ftparchive/apt-ftparchive.cc:803 +msgid "No selections matched" +msgstr "Không có cái được chọn khớp được" + +#: ftparchive/apt-ftparchive.cc:881 #, 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" +msgid "Some files are missing in the package file group `%s'" +msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." -#: apt-pkg/cacheset.cc:629 +#: ftparchive/cachedb.cc:47 #, 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ử" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." -#: apt-pkg/cacheset.cc:637 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" -"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " -"đặt" +msgid "DB is old, attempting to upgrade %s" +msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 -msgid "Send scenario to solver" -msgstr "Gửi kịch bản đến bộ phân giải" +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " +"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." -#: apt-pkg/edsp.cc:209 -msgid "Send request to solver" -msgstr "Gửi yêu cầu đến bộ phân giải" +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: apt-pkg/edsp.cc:279 -msgid "Prepare for receiving solution" -msgstr "Chuẩn bị để lấy cách giải quyết" +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "Kho không có mục ghi điều khiển" -#: apt-pkg/edsp.cc:286 -msgid "External solver failed without a proper error message" -msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "Không thể lấy con trỏ" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 -msgid "Execute external solver" -msgstr "Thi hành bộ phân giải từ bên ngoài" +#: ftparchive/writer.cc:82 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "CB: Không thể đọc thư mục %s\n" -#: apt-pkg/install-progress.cc:51 +#: ftparchive/writer.cc:87 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Diễn biến: [%3i%%]" +msgid "W: Unable to stat %s\n" +msgstr "CB: Không thể lấy thông tin thống kê %s\n" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 -msgid "Running dpkg" -msgstr "Đang chạy dpkg" +#: ftparchive/writer.cc:143 +msgid "E: " +msgstr "L: " -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." -msgstr "" -"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " -"được dùng thay thế." +#: ftparchive/writer.cc:145 +msgid "W: " +msgstr "CB: " -#: apt-pkg/deb/dpkgpm.cc:91 -#, c-format -msgid "Installing %s" -msgstr "Đang cài đặt %s" +#: ftparchive/writer.cc:152 +msgid "E: Errors apply to file " +msgstr "LỖI: có lỗi áp dụng vào tập tin " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 #, c-format -msgid "Configuring %s" -msgstr "Đang cấu hình %s" +msgid "Failed to resolve %s" +msgstr "Gặp lỗi khi phân giải %s" + +#: ftparchive/writer.cc:183 +msgid "Tree walking failed" +msgstr "Việc di chuyển qua cây bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: ftparchive/writer.cc:210 #, c-format -msgid "Removing %s" -msgstr "Đang gỡ bỏ %s" +msgid "Failed to open %s" +msgstr "Gặp lỗi khi mở %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: ftparchive/writer.cc:269 #, c-format -msgid "Completely removing %s" -msgstr "Đang gỡ bỏ hoàn toàn %s" +msgid " DeLink %s [%s]\n" +msgstr " Bỏ liên kết %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:277 #, c-format -msgid "Noting disappearance of %s" -msgstr "Đang ghi chép sự biến mất của %s" +msgid "Failed to readlink %s" +msgstr "Gặp lỗi khi đọc liên kết %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: ftparchive/writer.cc:281 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Đang chạy bẫy sau-cài-đặt %s" +msgid "Failed to unlink %s" +msgstr "Việc bỏ liên kết %s bị lỗi" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: ftparchive/writer.cc:289 #, c-format -msgid "Directory '%s' missing" -msgstr "Thiếu thư mục “%s”" +msgid "*** Failed to link %s to %s" +msgstr "*** Gặp lỗi khi liên kết %s đến %s" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: ftparchive/writer.cc:299 #, c-format -msgid "Could not open file '%s'" -msgstr "Không thể mở tập tin “%s”" +msgid " DeLink limit of %sB hit.\n" +msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: apt-pkg/deb/dpkgpm.cc:970 -#, c-format -msgid "Preparing %s" -msgstr "Đang chuẩn bị %s" +#: ftparchive/writer.cc:404 +msgid "Archive had no package field" +msgstr "Kho không có trường gói" -#: apt-pkg/deb/dpkgpm.cc:971 +#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 #, c-format -msgid "Unpacking %s" -msgstr "Đang mở gói %s" +msgid " %s has no override entry\n" +msgstr " %s không có mục ghi đè (override)\n" -#: apt-pkg/deb/dpkgpm.cc:976 +#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 #, c-format -msgid "Preparing to configure %s" -msgstr "Đang chuẩn bị cấu hình %s" +msgid " %s maintainer is %s not %s\n" +msgstr " người bảo trì %s là %s không phải %s\n" -#: apt-pkg/deb/dpkgpm.cc:978 +#: ftparchive/writer.cc:712 #, c-format -msgid "Installed %s" -msgstr "Đã cài đặt %s" +msgid " %s has no source override entry\n" +msgstr " %s không có mục ghi đè (override) nguồn\n" -#: apt-pkg/deb/dpkgpm.cc:983 +#: ftparchive/writer.cc:716 #, c-format -msgid "Preparing for removal of %s" -msgstr "Đang chuẩn bị gỡ bỏ %s" +msgid " %s has no binary override entry either\n" +msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" -#: apt-pkg/deb/dpkgpm.cc:985 -#, c-format -msgid "Removed %s" -msgstr "Đã gỡ bỏ %s" +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:990 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" +msgid "Unable to open %s" +msgstr "Không thể mở %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Completely removed %s" -msgstr "Gỡ bỏ hoàn toàn %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Sai “override” %s dòng %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:1046 -msgid "ioctl(TIOCGWINSZ) failed" -msgstr "" +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: ftparchive/override.cc:163 #, c-format -msgid "Can not write log (%s)" -msgstr "Không thể ghi nhật ký (%s)" +msgid "Malformed override %s line %llu #1" +msgstr "Sai override %s dòng %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1049 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts đã gắn chưa?" +#: ftparchive/override.cc:175 +#, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Sai override %s dòng %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1070 -msgid "Is stdout a terminal?" -msgstr "Đầu ra là thiết bị cuối?" +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Sai override %s dòng %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1558 -msgid "Operation was interrupted before it could finish" -msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" +#: ftparchive/multicompress.cc:70 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Không biết thuật toán nén “%s”" -#: apt-pkg/deb/dpkgpm.cc:1620 -msgid "No apport report written because MaxReports is reached already" -msgstr "" -"Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)" +#: ftparchive/multicompress.cc:100 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "dependency problems - leaving unconfigured" -msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" +#: ftparchive/multicompress.cc:189 +msgid "Failed to create FILE*" +msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:1627 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " -"do một sự thất bại trước đó." +#: ftparchive/multicompress.cc:192 +msgid "Failed to fork" +msgstr "Gặp lỗi khi rẽ nhánh tiến trình" -#: apt-pkg/deb/dpkgpm.cc:1633 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" +#: ftparchive/multicompress.cc:206 +msgid "Compress child" +msgstr "Nén con" -#: apt-pkg/deb/dpkgpm.cc:1640 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " -"bộ nhớ”" +#: ftparchive/multicompress.cc:229 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " -"thống nội bộ" +#: ftparchive/multicompress.cc:302 +msgid "IO to subprocess/file failed" +msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#: apt-pkg/deb/dpkgpm.cc:1674 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" +#: ftparchive/multicompress.cc:340 +msgid "Failed to read while computing MD5" +msgstr "Gặp lỗi khi đọc trong khi tính MD5" -#: apt-pkg/deb/debsystem.cc:84 +#: ftparchive/multicompress.cc:356 #, c-format +msgid "Problem unlinking %s" +msgstr "Gặp lỗi khi bỏ liên kết %s" + +#: cmdline/apt-internal-solver.cc:38 msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " -"phải không?" +"Cách dùng: apt-internal-solver\n" +"\n" +"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" +"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" +"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này.\n" +" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-pkg/deb/debsystem.cc:87 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Không hiểu bản ghi gói!" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 -#, c-format +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " -"vấn đề này. " - -#: apt-pkg/deb/debsystem.cc:121 -msgid "Not locked" -msgstr "Chưa được khoá" +"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" +"\n" +"[sortpkgs: sort packages: sắp xếp các gói]\n" +"\n" +"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" +"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp_ này\n" +" -s Sắp xếp những tập tin _nguồn_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " -- cgit v1.2.3 From 362b152c38195a3d51406285011fc34238158bda Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 13 Feb 2014 09:51:57 +0100 Subject: remove duplicated apt-get download apt apt test --- test/integration/test-apt-get-download | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index 7cce6ef29..be3144e1f 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -45,7 +45,3 @@ rm -f apt_1.0_all.deb apt_2.0_all.deb testsuccess aptget download apt apt apt/unstable apt=2.0 testsuccess test -s apt_2.0_all.deb -# deb:738103 - apt-get download foo foo fails -rm -f apt_*.deb -aptget download apt apt -testsuccess test -s apt_2.0_all.deb -- cgit v1.2.3 From 72bae92a6c0deb638b0daf844ccb06273b1723c6 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 13 Feb 2014 09:52:03 +0100 Subject: releasing package apt version 0.9.15.2 --- configure.ac | 2 +- debian/changelog | 24 + doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 6 +- doc/po/de.po | 4 +- doc/po/es.po | 4 +- doc/po/fr.po | 4 +- doc/po/it.po | 4 +- doc/po/ja.po | 4 +- doc/po/pl.po | 4 +- doc/po/pt.po | 4 +- doc/po/pt_BR.po | 4 +- po/ar.po | 199 ++-- po/ast.po | 208 ++-- po/bg.po | 208 ++-- po/bs.po | 201 ++-- po/ca.po | 208 ++-- po/cs.po | 208 ++-- po/cy.po | 201 ++-- po/da.po | 208 ++-- po/de.po | 208 ++-- po/dz.po | 210 ++-- po/el.po | 208 ++-- po/es.po | 208 ++-- po/eu.po | 208 ++-- po/fi.po | 208 ++-- po/fr.po | 208 ++-- po/gl.po | 208 ++-- po/hu.po | 208 ++-- po/it.po | 208 ++-- po/ja.po | 208 ++-- po/km.po | 210 ++-- po/ko.po | 208 ++-- po/ku.po | 195 ++-- po/lt.po | 199 ++-- po/mr.po | 208 ++-- po/nb.po | 208 ++-- po/ne.po | 210 ++-- po/nl.po | 208 ++-- po/nn.po | 210 ++-- po/pl.po | 208 ++-- po/pt.po | 208 ++-- po/pt_BR.po | 208 ++-- po/ro.po | 208 ++-- po/ru.po | 208 ++-- po/sk.po | 208 ++-- po/sl.po | 208 ++-- po/sv.po | 208 ++-- po/th.po | 208 ++-- po/tl.po | 210 ++-- po/tr.po | 208 ++-- po/uk.po | 208 ++-- po/vi.po | 2806 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 208 ++-- po/zh_TW.po | 208 ++-- 55 files changed, 5743 insertions(+), 5830 deletions(-) diff --git a/configure.ac b/configure.ac index a49c9a479..de784a76b 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.1" +PACKAGE_VERSION="0.9.15.2" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 40085985f..22624bcaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +apt (0.9.15.2) unstable; urgency=medium + + [ Michael Vogt ] + * move isatty() check into InitOutput() + * Use a APT::VersionSet instead of a VersionList + (closes: #738103) + + [ David Kalnischkies ] + * simplify code to make compilers happy + * update libapt-pkg.symbols file + * bump Standards-Version to 3.9.5 (no changes needed) + * do not use an empty APT_CONFIG environment variable + * always cleanup patchfiles at the end of rred call + * use VersionSet in download to handle repeats (Closes: 738103) + * use utimes instead of utimensat/futimens (Closes: 738567) + + [ John Ogness ] + * apt-cdrom should succeed if any drive succeeds (Closes: 728153) + + [ Trần Ngọc Quân ] + * l10n: vi.po (621t): Update and review + + -- Michael Vogt <mvo@debian.org> Thu, 13 Feb 2014 09:50:04 +0100 + apt (0.9.15.1) unstable; urgency=medium [ David Kalnischkies ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index a96c84d3a..cadcc27ae 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15.1"> +<!ENTITY apt-product-version "0.9.15.2"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 36aa51ff9..d0973638a 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.15.1\n" +"Project-Id-Version: apt-doc 0.9.15.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -6186,7 +6186,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/de.po b/doc/po/de.po index 6914f6fdc..69f018966 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -8750,7 +8750,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/es.po b/doc/po/es.po index 6e277b452..213c704b1 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -8762,7 +8762,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/fr.po b/doc/po/fr.po index 11d4bfeb7..0a240192a 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -8723,7 +8723,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/it.po b/doc/po/it.po index 97fa23697..23d39d156 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -8736,7 +8736,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index 57dad234e..3b78ee69b 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -8306,7 +8306,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index b0311d96f..99c07d3ff 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -7966,7 +7966,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index 24d74f0e5..3092cd08d 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -8670,7 +8670,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 4c6f1bb5b..8bc4e768d 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-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+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" @@ -6601,7 +6601,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/po/ar.po b/po/ar.po index a524dc0e2..12f2a2a4e 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -160,7 +160,7 @@ msgstr "" msgid " Version table:" msgstr " جدول النسخ:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -222,12 +222,12 @@ msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2. msgid "Please insert a Disc in the drive and press enter" msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "فشل تغيير اسم %s إلى %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." @@ -643,12 +643,12 @@ msgstr "لم يُعثر على القرص." msgid "File not found" msgstr "لم يُعثر على الملف" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -907,7 +907,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1212,108 +1212,108 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟" msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " أو" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1321,27 +1321,27 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" @@ -1350,7 +1350,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1358,21 +1358,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1540,7 +1540,7 @@ msgstr "فشل إغلاق الملف %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -1843,47 +1843,47 @@ msgstr "" msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "خطأ داخلي، تعذر إنشاء %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" @@ -1997,12 +1997,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "فشلت كتابة الملف %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" @@ -2380,22 +2380,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2644,7 +2644,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "" @@ -2814,35 +2814,35 @@ msgstr "الحجم غير متطابق" msgid "Invalid file format" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2850,24 +2850,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2903,71 +2903,64 @@ msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/cdrom.cc:575 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" +msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 +#: apt-pkg/cdrom.cc:583 +msgid "Unmounting CD-ROM\n" +msgstr "فك تركيب القرص المدمج\n" + +#: apt-pkg/cdrom.cc:588 +msgid "Waiting for disc...\n" +msgstr "بانتظار القرص...\n" + +#: apt-pkg/cdrom.cc:597 +msgid "Mounting CD-ROM...\n" +msgstr "تركيب القرص...\n" + +#: apt-pkg/cdrom.cc:605 msgid "Identifying.. " msgstr "جاري التعرف..." -#: apt-pkg/cdrom.cc:613 +#: apt-pkg/cdrom.cc:643 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "فك تركيب القرص المدمج..." -#: apt-pkg/cdrom.cc:642 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" -msgstr "فك تركيب القرص المدمج\n" - -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" -msgstr "بانتظار القرص...\n" - -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "تركيب القرص...\n" - -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -2976,15 +2969,15 @@ msgstr "" "هذا القرص مسمى: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "نسخ قوائم الحزم..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "كتابة لائحة المصادر الجديدة\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/ast.po b/po/ast.po index 15a485a67..617e576c9 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -153,7 +153,7 @@ msgstr " Chincheta de paquetes: " msgid " Version table:" msgstr " Tabla de versiones:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -253,12 +253,12 @@ msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Inxerta un discu nel preséu y calca intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falló al montar '%s' a '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repite'l procesu colos demás CDs del conxuntu." @@ -749,12 +749,12 @@ msgstr "Nun s'atopa'l discu." msgid "File not found" msgstr "Nun s'atopa'l ficheru." -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -1016,7 +1016,7 @@ msgstr "" "Les robles siguientes nun pudieron verificase porque la to llave pública nun " "ta a mano:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1334,108 +1334,108 @@ msgstr "¿Instalar esos paquetes ensin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1443,27 +1443,27 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" @@ -1472,7 +1472,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1480,21 +1480,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" @@ -1667,7 +1667,7 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" @@ -2025,47 +2025,47 @@ msgstr "Saltu mal formáu %s llinia %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Saltu mal formáu %s llinia %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmu de compresión desconocíu '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La salida comprimida %s necesita un xuegu de compresión" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nun pudo criase FICHERU*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Nun pudo biforcase" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimir fíu" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Error internu, nun pudo criase %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Fallu na ES al soprocesu/ficheru" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Nun pudo lleese al computar MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema al desenllazar %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" @@ -2202,12 +2202,12 @@ msgstr "Doble suma de desvíu %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ficheru de configuración duplicáu %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura nel ficheru %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Falló al pesllar el ficheru %s" @@ -2590,22 +2590,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -2865,7 +2865,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta'l direutoriu de llistes %spartial." @@ -3037,35 +3037,35 @@ msgstr "El tamañu nun concasa" msgid "Invalid file format" msgstr "Operación incorreuta: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3075,12 +3075,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3089,12 +3089,12 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3132,50 +3132,41 @@ msgstr "Entrada inválida pa 'Date' nel ficheru release %s" msgid "Vendor block %s contains no fingerprint" msgstr "El bloque de fornidor %s nun contién una buelga dixital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Usando el puntu de montaxe de CD-ROM %s\n" -"Montando el CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etiqueta guardada: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando l CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el puntu de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando'l CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Esperando'l discu...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando'l CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etiqueta guardada: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando l CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Buscando nel discu ficheros d'índices...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3184,7 +3175,7 @@ msgstr "" "Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y " "%zu firmes\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3192,16 +3183,16 @@ msgstr "" "Nun s'alcuentra dengún paquete de ficheros, seique nun ye un Discu Debian o " "hai una arquiteutura inválida?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Atopóse la etiqueta: '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Esi nun ye un nome válidu; inténtalo otra vuelta.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3210,15 +3201,15 @@ msgstr "" "Esti discu llámase: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando les llistes de paquetes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Escribiendo llista nueva d'oríxenes\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n" @@ -3526,6 +3517,13 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiáu" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Usando el puntu de montaxe de CD-ROM %s\n" +#~ "Montando el CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/bg.po b/po/bg.po index 860ab7e10..a7745b195 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -159,7 +159,7 @@ msgstr " Отбиване на пакета: " msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Укажете име за този диск, например „Debian msgid "Please insert a Disc in the drive and press enter" msgstr "Сложете диск в устройството и натиснете „Enter“" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Неуспех при монтиране на %s на %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторете този процес за останалите дискове от комплекта." @@ -776,12 +776,12 @@ msgstr "Дискът не е намерен." msgid "File not found" msgstr "Файлът не е намерен" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1048,7 +1048,7 @@ msgstr "" "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " "наличен:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Празни файлове не могат да бъдат валидни архиви" @@ -1368,108 +1368,108 @@ msgstr "Инсталиране на тези пакети без проверк msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " или" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1477,27 +1477,27 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" @@ -1506,7 +1506,7 @@ msgstr "%lu не са напълно инсталирани или премах #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1514,21 +1514,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -1702,7 +1702,7 @@ msgstr "Грешка при четене файла „%s“ от огледал msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" @@ -2062,47 +2062,47 @@ msgstr "Неправилно форматиран override %s, ред %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Неправилно форматиран override %s, ред %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Непознат алгоритъм за компресия „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Компресираният изход %s изисква настройка за компресирането" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Неуспех при създаването на FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Неуспех при пускането на подпроцес" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Процес-потомък за компресиране" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Вътрешна грешка, неуспех при създаването на %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "В/И към подпроцеса/файла пропадна" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Неуспех при четене докато се изчислява MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" @@ -2237,12 +2237,12 @@ msgstr "Двойно добавяне на отклонение %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Дублиран конфигурационен файл %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Неуспех при запис на файл %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" @@ -2630,22 +2630,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2911,7 +2911,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Директорията със списъци %spartial липсва." @@ -3090,7 +3090,7 @@ msgstr "Несъответствие на размера" msgid "Invalid file format" msgstr "Невалидна операция %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3099,16 +3099,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3117,12 +3117,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3132,12 +3132,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3146,12 +3146,12 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3188,50 +3188,41 @@ msgstr "Неправилна стойност за „Date“ във фай msgid "Vendor block %s contains no fingerprint" msgstr "Блокът на производителя %s не съдържа отпечатък" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Използване на точка за монтиране на CD-ROM %s\n" -"Монтиране на CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Идентифициране..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Запазен етикет: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Демонтиране на CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Използване на точка за монтиране на CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Демонтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Чакане за диск...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Монтиране на CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Идентифициране..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Запазен етикет: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтиране на CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Сканиране на диска за индексни файлове...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3240,7 +3231,7 @@ msgstr "" "Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu " "индекса с преводи и %zu подписа.\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3248,16 +3239,16 @@ msgstr "" "Не са намерени файлове с пакети. Мое би дискът не е с Дебиан или е за " "погрешна компютърна архитектура." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Намерен е етикет „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Това не е валидно име, опитайте отново.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3266,15 +3257,15 @@ msgstr "" "Наименование на този диск: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" @@ -3584,6 +3575,13 @@ msgstr "" msgid "Not locked" msgstr "Без заключване" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Използване на точка за монтиране на CD-ROM %s\n" +#~ "Монтиране на CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/bs.po b/po/bs.po index 85e507b3a..32164cd30 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -155,7 +155,7 @@ msgstr "" msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -216,12 +216,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Ne mogu otvoriti %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -649,12 +649,12 @@ msgstr "Datoteka nije pronađena" msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "" @@ -913,7 +913,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1212,135 +1212,135 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ali nije instaliran" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ili" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1349,7 +1349,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1357,21 +1357,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1535,7 +1535,7 @@ msgstr "Ne mogu otvoriti %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -1837,47 +1837,47 @@ msgstr "" msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1991,12 +1991,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2374,22 +2374,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "" @@ -2639,7 +2639,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "" @@ -2807,35 +2807,35 @@ msgstr "" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2843,24 +2843,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2896,88 +2896,81 @@ msgstr "Ne mogu otvoriti DB datoteku %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "" - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Pogrešan CD" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "" + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Pogrešan CD" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index f5d32b07a..5b77752af 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -157,7 +157,7 @@ msgstr " Etiqueta del paquet: " msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -255,12 +255,12 @@ msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»" msgid "Please insert a Disc in the drive and press enter" msgstr "Inseriu un disc en la unitat i premeu Intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No s'ha pogut muntar «%s» a «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetiu aquest procés per a la resta de CD del vostre joc." @@ -760,12 +760,12 @@ msgstr "No s'ha trobat el disc" msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1031,7 +1031,7 @@ msgstr "" "Les signatures següents no s'han pogut verificar perquè la clau pública no " "està disponible:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vàlids" @@ -1357,108 +1357,108 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1466,27 +1466,27 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" @@ -1495,7 +1495,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1503,21 +1503,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -1689,7 +1689,7 @@ msgstr "No es pot llegir el fitxer rèplica «%s»" msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" @@ -2046,47 +2046,47 @@ msgstr "Línia predominant %s malformada %llu núm 2" msgid "Malformed override %s line %llu #3" msgstr "Línia predominant %s malformada %llu núm 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorisme de compressió desconegut '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La sortida comprimida %s necessita un joc de compressió" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "No s'ha pogut crear FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "No s'ha pogut bifurcar" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimeix el fil" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" @@ -2221,12 +2221,12 @@ msgstr "Afegit doble d'una desviació %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fitxer de conf. duplicat %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" @@ -2614,22 +2614,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2891,7 +2891,7 @@ msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directori de llistes %spartial." @@ -3071,7 +3071,7 @@ msgstr "La mida no concorda" msgid "Invalid file format" msgstr "Operació no vàlida %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3080,16 +3080,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3098,12 +3098,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3114,12 +3114,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3129,12 +3129,12 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3172,50 +3172,41 @@ msgstr "El camp «Date» al fitxer Release %s és invàlid" msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"S'està utilitzant el punt de muntatge de CD-ROM %s\n" -"S'està muntant el CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "S'està identificant…" - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "S'ha emmagatzemat l'etiqueta: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "S'esta desmuntant el CD-ROM…\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "S'està desmuntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc…\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM…\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "S'està identificant…" + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "S'ha emmagatzemat l'etiqueta: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "S'esta desmuntant el CD-ROM…\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "S'està analitzant el disc per a fitxers d'índex…\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3224,7 +3215,7 @@ msgstr "" "S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de " "traduccions i %zu signatures\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3232,16 +3223,16 @@ msgstr "" "No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la " "arquitectura és incorrecta?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "S'ha trobat l'etiqueta «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3250,15 +3241,15 @@ msgstr "" "El disc es diu:\n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets…" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" @@ -3567,6 +3558,13 @@ msgstr "" msgid "Not locked" msgstr "No blocat" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "S'està utilitzant el punt de muntatge de CD-ROM %s\n" +#~ "S'està muntant el CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/cs.po b/po/cs.po index 2ff4c08fa..3f74994f9 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -154,7 +154,7 @@ msgstr " Vypíchnutý balík: " msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -247,12 +247,12 @@ msgstr "Zadejte prosím název tohoto média, např. „Debian 5.0.3 Disk 1“" msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte prosím médium do mechaniky a stiskněte enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Selhalo připojení „%s“ na „%s“" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Tento proces opakujte pro všechna zbývající média." @@ -758,12 +758,12 @@ msgstr "Disk nebyl nalezen." msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1024,7 +1024,7 @@ msgstr "" "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný " "klíč:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Prázdné soubory nejsou platnými archivy" @@ -1346,108 +1346,108 @@ msgstr "Instalovat tyto balíky bez ověření?" msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " nebo" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1455,27 +1455,27 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" @@ -1484,7 +1484,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1492,21 +1492,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -1679,7 +1679,7 @@ msgstr "Nelze číst soubor se zrcadly „%s“" msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" @@ -2029,47 +2029,47 @@ msgstr "Zkomolený override soubor %s, řádek %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Zkomolený override soubor %s, řádek %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámý kompresní algoritmus „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potřebuje kompresní sadu" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Selhalo vytvoření FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Volání fork() se nezdařilo" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimovat potomka" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "V/V operace s podprocesem/souborem selhala" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Chyba čtení při výpočtu MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" @@ -2203,12 +2203,12 @@ msgstr "Dvojí přidání diverze %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" @@ -2590,22 +2590,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problém při zavírání souboru %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2860,7 +2860,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Adresář seznamů %spartial chybí." @@ -3032,7 +3032,7 @@ msgstr "Velikosti nesouhlasí" msgid "Invalid file format" msgstr "Neplatná operace %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3041,16 +3041,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3059,12 +3059,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3074,12 +3074,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3088,12 +3088,12 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento " "balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3130,50 +3130,41 @@ msgstr "Neplatná položka „Date“ v Release souboru %s" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Používám přípojný bod %s\n" -"Připojuji CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Rozpoznávám… " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Uložený název: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Odpojuji CD-ROM…\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Odpojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čekám na disk…\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM…\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Rozpoznávám… " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Uložený název: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Odpojuji CD-ROM…\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Hledám na disku indexové soubory…\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3182,7 +3173,7 @@ msgstr "" "Nalezeny indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a " "podpisy (%zu)\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3190,16 +3181,16 @@ msgstr "" "Nenalezeny žádné balíky. Možná to není disk s Debianem, nebo je pro jinou " "architekturu?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Nalezený název: „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3208,15 +3199,15 @@ msgstr "" "Tento disk se nazývá: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků…" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" @@ -3512,6 +3503,13 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „% msgid "Not locked" msgstr "Není uzamčen" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Používám přípojný bod %s\n" +#~ "Připojuji CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/cy.po b/po/cy.po index 14c656a47..b971b013b 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -173,7 +173,7 @@ msgstr " Pin Pecyn: " msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -274,12 +274,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -767,12 +767,12 @@ msgstr "Ffeil heb ei ganfod" msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1036,7 +1036,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1359,111 +1359,111 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1473,27 +1473,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1502,7 +1502,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1510,21 +1510,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1693,7 +1693,7 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" @@ -2053,48 +2053,48 @@ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 #, fuzzy msgid "Compress child" msgstr "Plentyn Cywasgu" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, fuzzy, c-format msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -2234,12 +2234,12 @@ msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -2628,22 +2628,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2912,7 +2912,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." @@ -3093,7 +3093,7 @@ msgstr "Camgyfatebiaeth maint" msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3101,28 +3101,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3130,13 +3130,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3145,12 +3145,12 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3189,89 +3189,82 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "" - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "CD Anghywir" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "" + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/da.po b/po/da.po index ce9926c70..aea3dc547 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -160,7 +160,7 @@ msgstr " Pakke-pin: " msgid " Version table:" msgstr " Versionstabel:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Indsæt en disk i drevet og tryk retur" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Kunne ikke montere %s til %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gentag processen for resten af cd'erne i dit sæt." @@ -786,12 +786,12 @@ msgstr "Disk blev ikke fundet." msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -1056,7 +1056,7 @@ msgstr "" "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er " "tilgængelig:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" @@ -1376,105 +1376,105 @@ msgstr "Installér disse pakker uden verifikation?" msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "installeret,kan opgraderes til: " -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 msgid "[installed,local]" msgstr "[Installeret,lokalt]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 msgid "[installed,automatic]" msgstr "[Installeret,automatisk]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 msgid "[installed]" msgstr "[Installeret]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, fuzzy, c-format msgid "[upgradable from: %s]" msgstr "[kan opgraderes fra: " -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "[residual-konfig]" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1482,27 +1482,27 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" @@ -1511,7 +1511,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1519,21 +1519,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -1704,7 +1704,7 @@ msgstr "Ingen post fundet i spejlfil »%s«" msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" @@ -2061,47 +2061,47 @@ msgstr "Ugyldig gennemtvangs %s-linje %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Ugyldig gennemtvangs %s-linje %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukendt komprimeringsalgoritme »%s«" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerede uddata %s kræver et komprimeringssæt" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Kunne ikke oprette FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Kunne ikke spalte" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern fejl. Kunne ikke oprette %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO til underproces/fil mislykkedes" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Kunne ikke læse under beregning af MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem under aflænkning af %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" @@ -2236,12 +2236,12 @@ msgstr "Dobbelt tilføjelse af omrokering %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opsætningsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" @@ -2622,22 +2622,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2895,7 +2895,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappen %spartial mangler." @@ -3067,7 +3067,7 @@ msgstr "Størrelsen stemmer ikke" msgid "Invalid file format" msgstr "Ugyldigt filformat" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3076,17 +3076,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3095,12 +3095,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3110,12 +3110,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3124,12 +3124,12 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3165,50 +3165,41 @@ msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s" msgid "Vendor block %s contains no fingerprint" msgstr "Leverandørblok %s inderholder intet fingeraftryk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Bruger cdrom-monteringspunktet %s\n" -"Monterer cdrom\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificerer .. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Gemt mærkat: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Afmonterer cdrom ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger cdrom-monteringspunktet %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Afmonterer cdrom\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Venter på disken ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterer cdrom ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificerer .. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Gemt mærkat: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Afmonterer cdrom ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Skanner disken for indeksfiler ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3217,7 +3208,7 @@ msgstr "" "Fandt %zu pakkeindekser, %zu kildeindekser, %zu oversættelsesindekser og %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3225,16 +3216,16 @@ msgstr "" "Kunne ikke finde nogen pakkefiler, det er muligvis ikke en Debiandisk eller " "den forkerte arkitektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Fandt mærkatet »%s«\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prøv igen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3243,15 +3234,15 @@ msgstr "" "Denne disk hedder: \n" "»%s«\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" @@ -3546,6 +3537,13 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet." msgid "Not locked" msgstr "Ikke låst" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Bruger cdrom-monteringspunktet %s\n" +#~ "Monterer cdrom\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/de.po b/po/de.po index 718a8c300..b09db2f4b 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -161,7 +161,7 @@ msgstr " Paket-Pinning: " msgid " Version table:" msgstr " Versionstabelle:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -260,12 +260,12 @@ msgstr "" "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die " "Eingabetaste (Enter)." -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "»%s« konnte nicht in »%s« eingebunden werden." -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes." @@ -796,12 +796,12 @@ msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -1071,7 +1071,7 @@ msgstr "" "öffentlicher\n" "Schlüssel nicht verfügbar ist:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gültiges Archiv sein." @@ -1401,109 +1401,109 @@ msgstr "Diese Pakete ohne Überprüfung installieren?" msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installiert]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installiert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installiert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installiert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " oder" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1511,27 +1511,27 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" @@ -1540,7 +1540,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1548,21 +1548,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -1735,7 +1735,7 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." @@ -2100,47 +2100,47 @@ msgstr "Missgestaltetes Override %s Zeile %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Missgestaltetes Override %s Zeile %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Unbekannter Komprimierungsalgorithmus »%s«" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz." -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Fork fehlgeschlagen" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimierungs-Kindprozess" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Interner Fehler, %s konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem beim Entfernen (unlink) von %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s konnte nicht in %s umbenannt werden." @@ -2276,12 +2276,12 @@ msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Datei %s konnte nicht geschrieben werden." -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Datei %s konnte nicht geschlossen werden." @@ -2674,22 +2674,22 @@ msgstr "" "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " "nicht möglich." -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem beim Synchronisieren der Datei" @@ -2951,7 +2951,7 @@ msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listenverzeichnis %spartial fehlt." @@ -3138,7 +3138,7 @@ msgstr "Größe stimmt nicht überein" msgid "Invalid file format" msgstr "Ungültige Operation %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3147,17 +3147,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3166,12 +3166,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3182,12 +3182,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3197,14 +3197,14 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3241,50 +3241,41 @@ msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s" msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck." -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Verwendeter CD-ROM-Einbindungspunkt: %s\n" -"CD-ROM wird eingebunden.\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifizieren ... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Gespeicherte Kennzeichnung: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Einbindung der CD-ROM wird gelöst ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Lösen der CD-ROM-Einbindung\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Warten auf Medium ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM wird eingebunden ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifizieren ... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Gespeicherte Kennzeichnung: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Einbindung der CD-ROM wird gelöst ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3293,7 +3284,7 @@ msgstr "" "%zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu " "Signaturen gefunden\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3301,16 +3292,16 @@ msgstr "" "Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine " "Debian-Disk oder eine für die falsche Architektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Kennzeichnung »%s« gefunden\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3319,15 +3310,15 @@ msgstr "" "Dieses Medium heißt: \n" "»%s«\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopieren der Paketlisten ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Schreiben der neuen Quellliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" @@ -3640,6 +3631,13 @@ msgstr "" msgid "Not locked" msgstr "Nicht gesperrt" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Verwendeter CD-ROM-Einbindungspunkt: %s\n" +#~ "CD-ROM wird eingebunden.\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/dz.po b/po/dz.po index ec6a7aaea..58d1e9abf 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -161,7 +161,7 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:" msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -261,12 +261,12 @@ msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ msgid "Please insert a Disc in the drive and press enter" msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།" @@ -742,12 +742,12 @@ msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1011,7 +1011,7 @@ msgid "" msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1326,108 +1326,108 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr "ཡང་ན།" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1435,27 +1435,27 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" @@ -1464,7 +1464,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1472,21 +1472,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "ཝའི།" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -1654,7 +1654,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" @@ -2016,47 +2016,47 @@ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག msgid "Malformed override %s line %llu #3" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2193,12 +2193,12 @@ msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ msgid "Duplicate conf file %s/%s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2577,22 +2577,22 @@ msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་% msgid "write, still have %llu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2850,7 +2850,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" @@ -3022,35 +3022,35 @@ msgstr "ཚད་མ་མཐུན།" msgid "Invalid file format" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3058,12 +3058,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3072,12 +3072,12 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3114,73 +3114,64 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Vendor block %s contains no fingerprint" msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -" %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" -"སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ།\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "ངོས་འཛིན་འབད་དོ.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོ།\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "ངོས་འཛིན་འབད་དོ.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་ %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསྐྱེད།\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3189,15 +3180,15 @@ msgstr "" "ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིན།\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" @@ -3482,6 +3473,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" +#~ "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ།\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" diff --git a/po/el.po b/po/el.po index 9f99d4de3..0d91aceef 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -166,7 +166,7 @@ msgstr " Καθήλωση Πακέτου: " msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -266,12 +266,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Αποτυχία σύνδεσης του %s σε %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας." @@ -753,12 +753,12 @@ msgstr "Ο δίσκος δεν βρέθηκε." msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1024,7 +1024,7 @@ msgstr "" "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " "διαθέσιμο το δημόσιο κλειδί:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1344,108 +1344,108 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " η" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1453,27 +1453,27 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" @@ -1482,7 +1482,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Ν/ο]" @@ -1490,21 +1490,21 @@ msgstr "[Ν/ο]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[ν/Ο]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -1674,7 +1674,7 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" @@ -2036,47 +2036,47 @@ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu msgid "Malformed override %s line %llu #3" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Αποτυχία αγκίστρωσης" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Συμπίεση απογόνου" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" @@ -2212,12 +2212,12 @@ msgstr "Διπλή προσθήκη εκτροπής %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" @@ -2601,22 +2601,22 @@ msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για αν msgid "write, still have %llu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2873,7 +2873,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Ο φάκελος λιστών %spartial αγνοείται." @@ -3051,35 +3051,35 @@ msgstr "Ανόμοιο μέγεθος" msgid "Invalid file format" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3087,12 +3087,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3101,12 +3101,12 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3144,50 +3144,41 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Vendor block %s contains no fingerprint" msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Χρησιμοποιείται το σημείο προσάρτησης %s\n" -"Προσαρτάται το CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Αναγνώριση..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Αποθήκευση Ετικέτας: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Αποπροσάρτηση του CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Αποπροσάρτηση του CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Αναγνώριση..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Αποθήκευση Ετικέτας: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Αποπροσάρτηση του CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3196,22 +3187,22 @@ msgstr "" "Βρέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι " "μεταφράσεων και %zu υπογραφές\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Εύρεση ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3220,15 +3211,15 @@ msgstr "" "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" @@ -3511,6 +3502,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Χρησιμοποιείται το σημείο προσάρτησης %s\n" +#~ "Προσαρτάται το CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" diff --git a/po/es.po b/po/es.po index 9e33aaf2c..c87710e2d 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -211,7 +211,7 @@ msgstr " Pin del paquete: " msgid " Version table:" msgstr " Tabla de versión:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -314,12 +314,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor, introduzca un disco en la unidad y pulse Intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No se pudo montar «%s» como «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para el resto de los CDs del conjunto." @@ -813,12 +813,12 @@ msgstr "Disco no encontrado." msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -1082,7 +1082,7 @@ msgstr "" "Las firmas siguientes no se pudieron verificar porque su llave pública no " "está disponible:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1408,108 +1408,108 @@ msgstr "¿Instalar estos paquetes sin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "pero no es instalable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "pero no está instalado" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1517,27 +1517,27 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" @@ -1546,7 +1546,7 @@ msgstr "%lu no instalados del todo o eliminados.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1554,21 +1554,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -1740,7 +1740,7 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "[Mirror: %s]" msgstr "[Réplica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" @@ -2103,47 +2103,47 @@ msgstr "Predominio mal formado %s línea %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Predominio mal formado %s línea %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo desconocido de compresión «%s»" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Salida comprimida %s necesita una herramienta de compresión" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "No se pudo crear FICHERO*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "No se pudo bifurcar" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Hijo compresión" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Error interno, no se pudo crear %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Falló la ES a subproceso/archivo" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "No se pudo leer mientras se computaba MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Se produjo un problema al desligar %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" @@ -2281,12 +2281,12 @@ msgstr "Doble suma de desviación %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuración duplicado %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura del archivo %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" @@ -2673,22 +2673,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Se produjo un problema al cerrar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Se produjo un problema al desligar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Se produjo un problema al sincronizar el fichero" @@ -2955,7 +2955,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directorio de listas %spartial." @@ -3132,37 +3132,37 @@ msgstr "El tamaño difiere" msgid "Invalid file format" msgstr "Operación inválida: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3173,12 +3173,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3188,12 +3188,12 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3231,50 +3231,41 @@ msgstr "Entrada «Date» inválida en el archivo «Release» %s" msgid "Vendor block %s contains no fingerprint" msgstr "Bloque de fabricante %s sin huella digital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Usando el punto de montaje del CD-ROM %s\n" -"Montando el CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etiqueta guardada: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando el CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando el CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etiqueta guardada: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando el CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Buscando en el disco archivos de índices...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3283,7 +3274,7 @@ msgstr "" "Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices " "de traducción y %zu firmas\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3291,16 +3282,16 @@ msgstr "" "No pude localizar ningún archivo de paquete, ¿quizás este no sea un disco de " "Debian o sea de otra arquitectura?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Se encontró la etiqueta: «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3309,15 +3300,15 @@ msgstr "" "Este disco se llama: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" @@ -3628,6 +3619,13 @@ msgstr "" msgid "Not locked" msgstr "No bloqueado" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Usando el punto de montaje del CD-ROM %s\n" +#~ "Montando el CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/eu.po b/po/eu.po index 8619b0b96..fbde6d3f8 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -159,7 +159,7 @@ msgstr " Paketearen pin-a:" msgid " Version table:" msgstr " Bertsio taula:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Mesedez sar diska bat gailuan eta enter sakatu" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu." @@ -741,12 +741,12 @@ msgstr "Ez da diska aurkitu" msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -1012,7 +1012,7 @@ msgstr "" "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " "eskuragarri:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1334,108 +1334,108 @@ msgstr "Paketeak egiaztapen gabe instalatu?" msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " edo" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1443,27 +1443,27 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" @@ -1472,7 +1472,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[B/e]" @@ -1480,21 +1480,21 @@ msgstr "[B/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[b/E]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -1662,7 +1662,7 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" @@ -2017,47 +2017,47 @@ msgstr "Gaizki osatutako override %s, lerroa: %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' Konpresio Algoritmo Ezezaguna" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s irteera konprimituak konpresio-tresna bat behar du" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Huts egin du FILE* sortzean" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Huts egin du sardetzean" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Konprimatu Umeak" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Barne Errorea, Huts %s sortzerakoan" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Huts egin du MD5 konputatzean" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" @@ -2192,12 +2192,12 @@ msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" @@ -2580,22 +2580,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2851,7 +2851,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "%spartial zerrenda-direktorioa falta da." @@ -3020,35 +3020,35 @@ msgstr "Tamaina ez dator bat" msgid "Invalid file format" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3056,12 +3056,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3070,12 +3070,12 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3113,50 +3113,41 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Vendor block %s contains no fingerprint" msgstr "%s saltzaile blokeak ez du egiaztapen markarik" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"%s CD-ROM muntatze puntua erabiltzen\n" -"CD-ROM-a muntatzen\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Egiaztatzen... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Gordetako Etiketa: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM Desmuntatzen...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM-a desmuntatzen\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Egiaztatzen... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Gordetako Etiketa: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM Desmuntatzen...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Indize fitxategien bila diska arakatzen...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3165,22 +3156,22 @@ msgstr "" "%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura " "aurkitu dira\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Aurkitutako Etiketa: '%s' \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Hau ez baliozko izen bat, froga berriro.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3189,15 +3180,15 @@ msgstr "" "Diskaren izen:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" @@ -3481,6 +3472,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "%s CD-ROM muntatze puntua erabiltzen\n" +#~ "CD-ROM-a muntatzen\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" diff --git a/po/fi.po b/po/fi.po index c0efe6487..8d8400609 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -157,7 +157,7 @@ msgstr " Paketin tunnistenumero: " msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Aseta levy asemaan ja paina Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Toista tämä lopuille rompuille kasassasi." @@ -735,12 +735,12 @@ msgstr "Levyä ei löydy" msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1004,7 +1004,7 @@ msgstr "" "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole " "saatavilla:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1326,108 +1326,108 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?" msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " tai" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1435,27 +1435,27 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" @@ -1464,7 +1464,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[K/e]" @@ -1472,21 +1472,21 @@ msgstr "[K/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "K" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -1654,7 +1654,7 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" @@ -2014,47 +2014,47 @@ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" msgid "Malformed override %s line %llu #3" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Tuntematon pakkausalgoritmi \"%s\"" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* luominen ei onnistunut" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork ei onnistunut" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Compress-lapsiprosessi" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" @@ -2189,12 +2189,12 @@ msgstr "Korvautuksen kaksoislisäys %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" @@ -2571,22 +2571,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2840,7 +2840,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Luettelokansio %spartial puuttuu." @@ -3011,35 +3011,35 @@ msgstr "Koko ei täsmää" msgid "Invalid file format" msgstr "Virheellinen toiminto %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3047,12 +3047,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3061,12 +3061,12 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3104,50 +3104,41 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Vendor block %s contains no fingerprint" msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Käytetään rompun liitoskohtaa %s\n" -"Liitetään romppu\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Tunnistetaan... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Tallennettu nimio: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Irrotetaan romppu...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Irrotetaan romppu\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Tunnistetaan... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Tallennettu nimio: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Irrotetaan romppu...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3156,22 +3147,22 @@ msgstr "" "Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, " "käännösten %zu ja allekirjoituksia löytyi %zu\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Löytyi nimiö: \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3180,15 +3171,15 @@ msgstr "" "Tämä levy on: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" @@ -3473,6 +3464,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Käytetään rompun liitoskohtaa %s\n" +#~ "Liitetään romppu\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" diff --git a/po/fr.po b/po/fr.po index 6740d57e9..68ef07aa9 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -156,7 +156,7 @@ msgstr " Épinglage de paquet : " msgid " Version table:" msgstr " Table de version :" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -260,12 +260,12 @@ msgid "Please insert a Disc in the drive and press enter" msgstr "" "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Impossible de monter « %s » sur « %s »" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Veuillez répéter cette opération pour tous les disques de votre jeu de " @@ -799,12 +799,12 @@ msgstr "Disque non trouvé." msgid "File not found" msgstr "Fichier non trouvé" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1075,7 +1075,7 @@ msgstr "" "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " "n'est pas disponible :\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" @@ -1409,108 +1409,108 @@ msgstr "Faut-il installer ces paquets sans vérification ?" msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installé]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installé]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installé]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installé]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1519,27 +1519,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" @@ -1548,7 +1548,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[O/n]" @@ -1556,21 +1556,21 @@ msgstr "[O/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[o/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -1744,7 +1744,7 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." msgid "[Mirror: %s]" msgstr "[Miroir : %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de créer le tube IPC sur le sous-processus" @@ -2105,47 +2105,47 @@ msgstr "Entrée « override » %s mal formée %llu n° 2" msgid "Malformed override %s line %llu #3" msgstr "Entrée « override » %s mal formée %llu n° 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorithme de compression « %s » inconnu" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La sortie compressée %s a besoin d'un ensemble de compression" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Impossible de créer FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Échec du fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Fils compressé" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Erreur interne, impossible de créer %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Impossible de lire lors du calcul de la somme MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problème en déliant %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" @@ -2283,12 +2283,12 @@ msgstr "Addition double d'une déviation %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fichier de configuration en double %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Erreur d'écriture du fichier %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Échec de clôture du fichier %s" @@ -2682,22 +2682,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2970,7 +2970,7 @@ msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Le répertoire %spartial pour les listes n'existe pas." @@ -3159,7 +3159,7 @@ msgstr "Taille incohérente" msgid "Invalid file format" msgstr "L'opération %s n'est pas valable" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3168,18 +3168,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3188,12 +3188,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3204,12 +3204,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3218,14 +3218,14 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3263,50 +3263,41 @@ msgstr "Entrée « Date » non valable dans le fichier Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Utilisation du point de montage %s pour le cédérom\n" -"Montage du cédérom\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identification..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Étiquette stockée : %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Démontage du cédérom...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cédérom\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Démontage du cédérom\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montage du cédérom...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identification..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Étiquette stockée : %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Démontage du cédérom...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Examen du disque à la recherche de fichiers d'index...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3315,7 +3306,7 @@ msgstr "" "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions " "et %zu signatures\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3323,16 +3314,16 @@ msgstr "" "Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian " "ou bien l'architecture est-elle incorrecte." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Étiquette « %s » trouvée\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3341,15 +3332,15 @@ msgstr "" "Ce disque s'appelle :\n" "« %s »\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Écriture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" @@ -3659,6 +3650,13 @@ msgstr "" msgid "Not locked" msgstr "Non verrouillé" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Utilisation du point de montage %s pour le cédérom\n" +#~ "Montage du cédérom\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/gl.po b/po/gl.po index fc10b5552..70aa59a65 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -161,7 +161,7 @@ msgstr " Inmobilizado: " msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»" msgid "Please insert a Disc in the drive and press enter" msgstr "Insira un disco na unidade e prema Intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Produciuse un fallo ao montar «%s» en «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para o resto de CD do seu conxunto." @@ -758,12 +758,12 @@ msgstr "Non se atopou o disco" msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -1029,7 +1029,7 @@ msgstr "" "Non se puideron verificar as seguintes sinaturas porque a chave pública non " "está dispoñíbel:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores válidos" @@ -1358,108 +1358,108 @@ msgstr "Instalar estes paquetes sen verificación?" msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mais non é instalábel" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mais non está instalado" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1467,27 +1467,27 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" @@ -1496,7 +1496,7 @@ msgstr "%lu non instalados ou retirados de todo.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1504,21 +1504,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" @@ -1691,7 +1691,7 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»" msgid "[Mirror: %s]" msgstr "[Replica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" @@ -2049,47 +2049,47 @@ msgstr "«Override» %s liña %lu incorrecta (2)" msgid "Malformed override %s line %llu #3" msgstr "«Override» %s liña %lu incorrecta (3)" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compresión «%s» descoñecido" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "A saída comprimida %s precisa dun conxunto de compresión" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Non foi posíbel crear o FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Non foi posíbel facer a bifurcación" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Fillo de compresión" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Produciuse un erro interno, non foi posíbel crear %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Produciuse un fallo na E/S do subproceso/ficheiro" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Non foi posíbel ler ao calcular o MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Xurdiu un problema ao desligar %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Non foi posíbel cambiar o nome de %s a %s" @@ -2226,12 +2226,12 @@ msgstr "Desvío %s -> %s engadido dúas veces" msgid "Duplicate conf file %s/%s" msgstr "Ficheiro de configuración %s/%s duplicado" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Non foi posíbel escribir no ficheiro «%s»" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Non foi posíbel pechar o ficheiro %s" @@ -2620,22 +2620,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Produciuse un problema ao desligar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Produciuse un problema ao sincronizar o ficheiro" @@ -2897,7 +2897,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Non se atopa a lista de directorios %sparcial." @@ -3073,7 +3073,7 @@ msgstr "Os tamaños non coinciden" msgid "Invalid file format" msgstr "Operación incorrecta: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3082,29 +3082,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3115,12 +3115,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3129,12 +3129,12 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3172,50 +3172,41 @@ msgstr "A entrada «Date» no ficheiro de publicación %s non é válida" msgid "Vendor block %s contains no fingerprint" msgstr "O bloque de provedor %s non contén unha pegada dixital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Empregando o punto de montaxe de CD-ROMs %s\n" -"Montando o CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etiqueta almacenada: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando o CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Empregando o punto de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando o CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Agardando polo disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando o CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etiqueta almacenada: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Buscando os ficheiros de índices no disco..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3224,7 +3215,7 @@ msgstr "" "Atopáronse %zu índices de paquetes, %zu índices de orixes, %zu índices de " "traducións e %zu sinaturas\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3232,16 +3223,16 @@ msgstr "" "Non é posíbel localizar ningún ficheiro de paquetes. É posíbel que non sexa " "un disco de Debian ou que a arquitectura sexa incorrecta." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Atopouse a etiqueta «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Ese non é un nome correcto, volva tentalo.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3250,15 +3241,15 @@ msgstr "" "Este disco chámase: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando as listas de paquetes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Escribindo a nova lista de orixes\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de orixes deste disco son:\n" @@ -3571,6 +3562,13 @@ msgstr "" msgid "Not locked" msgstr "Non está bloqueado" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Empregando o punto de montaxe de CD-ROMs %s\n" +#~ "Montando o CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/hu.po b/po/hu.po index da083b8c7..9a8c47b71 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -159,7 +159,7 @@ msgstr " Csomagrögzítés: " msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemez”" msgid "Please insert a Disc in the drive and press enter" msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "„%s” csatolása a(z) „%s” könyvtárba meghiúsult" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ismételje meg a folyamatot készlete többi CD-jével is." @@ -775,12 +775,12 @@ msgstr "A lemez nem található." msgid "File not found" msgstr "A fájl nem található" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -1045,7 +1045,7 @@ msgstr "" "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető " "el:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Az üres fájlok biztosan nem érvényes csomagok" @@ -1364,108 +1364,108 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " vagy" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1473,27 +1473,27 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" @@ -1502,7 +1502,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[I/n]" @@ -1510,21 +1510,21 @@ msgstr "[I/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[i/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -1696,7 +1696,7 @@ msgstr "A(z) „%s” tükörfájl nem olvasható" msgid "[Mirror: %s]" msgstr "[Tükör: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" @@ -2052,47 +2052,47 @@ msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" msgid "Malformed override %s line %llu #3" msgstr "%s felülbírálás deformált a(z) %llu. sorában #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "„%s” tömörítési algoritmus ismeretlen" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nem sikerült FILE*-ot létrehozni" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Nem sikerült forkolni" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Gyermekfolyamat tömörítése" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Belső hiba, %s létrehozása sikertelen" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Olvasási hiba az MD5 kiszámításakor" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Hiba %s törlésekor" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "„%s” átnevezése sikertelen erre: %s" @@ -2228,12 +2228,12 @@ msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "A(z) %s fájl írása sikertelen" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "A(z) %s fájl bezárása sikertelen" @@ -2622,22 +2622,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Hiba a(z) %s fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Hiba a(z) %s fájl törlésekor" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2903,7 +2903,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "A(z) %spartial listakönyvtár hiányzik." @@ -3081,7 +3081,7 @@ msgstr "A méret nem megfelelő" msgid "Invalid file format" msgstr "%s érvénytelen művelet" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3090,16 +3090,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3108,12 +3108,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3123,12 +3123,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3137,12 +3137,12 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3179,50 +3179,41 @@ msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban" msgid "Vendor block %s contains no fingerprint" msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"%s CD-ROM csatolási pont használata\n" -"CD-ROM csatolása\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Azonosítás... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Tárolt címke: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM leválasztása...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM leválasztása\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM csatolása...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Azonosítás... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Tárolt címke: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM leválasztása...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3231,7 +3222,7 @@ msgstr "" "%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás " "megtalálva\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3239,16 +3230,16 @@ msgstr "" "Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem " "megfelelő az architektúra?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Talált címke: „%s”\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "A név érvénytelen, próbálja újra.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3257,15 +3248,15 @@ msgstr "" "A lemez neve: \n" "„%s”\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" @@ -3566,6 +3557,13 @@ msgstr "" msgid "Not locked" msgstr "Nincs zárolva" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "%s CD-ROM csatolási pont használata\n" +#~ "CD-ROM csatolása\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/it.po b/po/it.po index 94d28a51e..2b3ece7f4 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -159,7 +159,7 @@ msgstr " Gancio del pacchetto: " msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -262,12 +262,12 @@ msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Inserire un disco nell'unità e premere Invio" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Mount di \"%s\" su \"%s\" non riuscito" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ripetere questo processo per il resto dei CD." @@ -788,12 +788,12 @@ msgstr "Disco non trovato" msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -1063,7 +1063,7 @@ msgstr "" "Le seguenti firme non sono state verificate perché la chiave pubblica non è " "disponibile:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" @@ -1392,108 +1392,108 @@ msgstr "Installare questi pacchetti senza verificarli?" msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installato]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installato]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installato]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installato]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ma non è installabile" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ma non è installato" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " oppure" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1502,27 +1502,27 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" @@ -1531,7 +1531,7 @@ msgstr "%lu non completamente installati o rimossi.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1539,21 +1539,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@ -1726,7 +1726,7 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\"" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" @@ -2088,47 +2088,47 @@ msgstr "Override %s riga %llu malformato #2" msgid "Malformed override %s line %llu #3" msgstr "Override %s riga %llu malformato #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo di compressione \"%s\" sconosciuto" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "L'output compresso %s necessita di un insieme di compressione" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Creazione di FILE* non riuscita" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Fork non riuscita" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Sottoprocesso compresso" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Errore interno, creazione di %s non riuscita" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "I/O al sottoprocesso/file non riuscito" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lettura durante l'elaborazione MD5 non riuscita" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Rinomina di %s in %s non riuscita" @@ -2262,12 +2262,12 @@ msgstr "Doppia aggiunta di deviazione %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplicato %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Scrittura del file %s non riuscita" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s non riuscita" @@ -2663,22 +2663,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, 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:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Si è verificato un problema nel sincronizzare il file" @@ -2950,7 +2950,7 @@ msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." # (ndt) sarebbe da controllare meglio assieme a quella dopo -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Manca la directory di liste %spartial." @@ -3131,7 +3131,7 @@ msgstr "Le dimensioni non corrispondono" msgid "Invalid file format" msgstr "Operazione %s non valida" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3140,17 +3140,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3159,12 +3159,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3174,12 +3174,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3188,14 +3188,14 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3233,50 +3233,41 @@ msgstr "Voce \"Date\" nel file Release %s non valida" msgid "Vendor block %s contains no fingerprint" msgstr "Il blocco vendor %s non contiene impronte" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Viene usato il punto di mount del CD-ROM %s\n" -"Montaggio CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificazione... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etichette archiviate: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Smontaggio CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Viene usato il punto di mount del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Smontaggio CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificazione... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etichette archiviate: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Smontaggio CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Analisi del disco per file indice...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3285,7 +3276,7 @@ msgstr "" "Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di " "traduzione e %zu firme\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3293,16 +3284,16 @@ msgstr "" "Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un " "disco Debian o potrebbe essere l'architettura errata." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Trovata l'etichetta \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Questo non è un nome valido, riprovare.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3311,15 +3302,15 @@ msgstr "" "Questo disco è chiamato: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copia elenco pacchetti..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Scrittura nuovo elenco sorgenti\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" @@ -3633,6 +3624,13 @@ msgstr "" msgid "Not locked" msgstr "Non bloccato" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Viene usato il punto di mount del CD-ROM %s\n" +#~ "Montaggio CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/ja.po b/po/ja.po index 2440aa449..e30393043 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -156,7 +156,7 @@ msgstr " パッケージ Pin: " msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "このディスクに、'Debian 5.0.3 Disk 1' のような名前を付 msgid "Please insert a Disc in the drive and press enter" msgstr "ディスクをドライブに入れて Enter キーを押してください" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s' を '%s' にマウントできませんでした" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。" @@ -778,12 +778,12 @@ msgstr "ディスクが見つかりません。" msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1046,7 +1046,7 @@ msgid "" "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "空のファイルは有効なアーカイブと認められません" @@ -1361,108 +1361,108 @@ msgstr "検証なしにこれらのパッケージをインストールします msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " または" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1470,27 +1470,27 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" @@ -1499,7 +1499,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除 #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1507,21 +1507,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -1694,7 +1694,7 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません" msgid "[Mirror: %s]" msgstr "[ミラー: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" @@ -2047,47 +2047,47 @@ msgstr "不正な override %s %llu 行目 #2" msgid "Malformed override %s line %llu #3" msgstr "不正な override %s %llu 行目 #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' は未知の圧縮アルゴリズムです" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "圧縮出力 %s には圧縮セットが必要です" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* の作成に失敗しました" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork に失敗しました" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "圧縮子プロセス" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "内部エラー、%s の作成に失敗しました" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 の計算中に読み込みに失敗しました" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" @@ -2221,12 +2221,12 @@ msgstr "%s -> %s の diversion が二重に追加されています" msgid "Duplicate conf file %s/%s" msgstr "設定ファイル %s/%s が重複しています" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" @@ -2610,22 +2610,22 @@ msgstr "読み込みが %llu 残っているはずですが、何も残ってい msgid "write, still have %llu to write but couldn't" msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2886,7 +2886,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "リストディレクトリ %spartial が見つかりません。" @@ -3065,7 +3065,7 @@ msgstr "サイズが適合しません" msgid "Invalid file format" msgstr "不正な操作 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3074,16 +3074,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3092,14 +3092,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3109,12 +3109,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3123,12 +3123,12 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3166,50 +3166,41 @@ msgstr "Release ファイル %s に無効な 'Date' エントリがあります" msgid "Vendor block %s contains no fingerprint" msgstr "ベンダブロック %s は鍵指紋を含んでいません" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"CD-ROM マウントポイント %s を使用します\n" -"CD-ROM をマウントしています\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "確認しています.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "格納されたラベル: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM をアンマウントしています ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM マウントポイント %s を使用します\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM をアンマウントしています\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "ディスクを待っています ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM をマウントしています ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "確認しています.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "格納されたラベル: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM をアンマウントしています ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "ディスクのインデックスファイルを走査しています ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3218,7 +3209,7 @@ msgstr "" "%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック" "ス、%zu の署名を見つけました\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3226,16 +3217,16 @@ msgstr "" "パッケージファイルを配置できません。Debian のディスクではないか、誤ったアーキ" "テクチャではないでしょうか?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "ラベル '%s' を見つけました\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "これは有効な名前ではありません。再試行してください。\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3244,15 +3235,15 @@ msgstr "" "このディスクは以下のように呼ばれます: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" @@ -3557,6 +3548,13 @@ msgstr "" msgid "Not locked" msgstr "ロックされていません" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "CD-ROM マウントポイント %s を使用します\n" +#~ "CD-ROM をマウントしています\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/km.po b/po/km.po index f1d9bee64..60090a304 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -161,7 +161,7 @@ msgstr " ខ្ទាស់​កញ្ចប់ ៖ " msgid " Version table:" msgstr " តារាង​កំណែ ៖" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​ msgid "Please insert a Disc in the drive and press enter" msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។" @@ -733,12 +733,12 @@ msgstr "រក​ថាសមិ​ន​ឃើញ​ ។" msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -997,7 +997,7 @@ msgid "" "available:\n" msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1308,108 +1308,108 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ឬ" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយ​សារតែ​ %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1417,27 +1417,27 @@ msgstr "" "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu ​ត្រូវបានបន្ទាប់ " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" @@ -1446,7 +1446,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1454,21 +1454,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" @@ -1636,7 +1636,7 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" @@ -1991,47 +1991,47 @@ msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "បង្ហាប់កូន" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" @@ -2166,12 +2166,12 @@ msgstr "ការបន្ថែម​ស្ទួន នៃការបង្ msgid "Duplicate conf file %s/%s" msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" @@ -2549,22 +2549,22 @@ msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អា msgid "write, still have %llu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2819,7 +2819,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" @@ -2990,35 +2990,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" msgid "Invalid file format" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3026,12 +3026,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3040,12 +3040,12 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3081,73 +3081,64 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1 msgid "Vendor block %s contains no fingerprint" msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" -"កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "បានទុក​ស្លាក ៖ %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "កំពុង​រង់ចាំឌីស​...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "បានទុក​ស្លាក ៖ %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i លិបិក្រម​ប្រភព%i និង ហត្ថលេខា %i \n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "បានទុក​ស្លាក ៖ %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "នោះមិនមែនជាឈ្មោះត្រឹមត្រូវទេ សូមព្យាយាម​ម្ដងទៀត ។\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3156,15 +3147,15 @@ msgstr "" "ឌីស​នេះ​ត្រូវ​បាន​ហៅ​ ៖ \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" @@ -3446,6 +3437,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" +#~ "កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" diff --git a/po/ko.po b/po/ko.po index bdfc73b70..2ee50c339 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -152,7 +152,7 @@ msgstr " 패키지 핀: " msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -250,12 +250,12 @@ msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')" msgid "Please insert a Disc in the drive and press enter" msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오." @@ -740,12 +740,12 @@ msgstr "디스크가 없습니다." msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -1005,7 +1005,7 @@ msgid "" "available:\n" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1319,108 +1319,108 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까?" msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [설치함]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [설치함]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [설치함]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [설치함]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " 혹은" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1428,27 +1428,27 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" @@ -1457,7 +1457,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1465,21 +1465,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -1651,7 +1651,7 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" @@ -2006,47 +2006,47 @@ msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" msgid "Malformed override %s line %llu #3" msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' 압축 알고리즘을 알 수 없습니다" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE*를 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork하는데 실패했습니다" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "압축 하위 프로세스" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "내부 오류, %s 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" @@ -2182,12 +2182,12 @@ msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s 파일을 쓰는데 실패했습니다" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는데 실패했습니다" @@ -2565,22 +2565,22 @@ msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습 msgid "write, still have %llu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "%s 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "%s 파일을 삭제하는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" @@ -2838,7 +2838,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "목록 디렉터리 %spartial이 빠졌습니다." @@ -3008,35 +3008,35 @@ msgstr "크기가 맞지 않습니다" msgid "Invalid file format" msgstr "잘못된 작업 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3046,12 +3046,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3060,12 +3060,12 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3102,57 +3102,48 @@ msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다" msgid "Vendor block %s contains no fingerprint" msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"CD-ROM 마운트 위치로 %s 사용\n" -"CD-ROM을 마운트하는 중입니다\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "알아보는 중입니다.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "저장된 레이블: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM 마운트 해제하는 중입니다\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "알아보는 중입니다.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "저장된 레이블: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3160,16 +3151,16 @@ msgstr "" "패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘" "못된 것 같습니다?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "레이블 발견: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3178,15 +3169,15 @@ msgstr "" "이 디스크는 다음과 같습니다: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "패키지 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" @@ -3480,6 +3471,13 @@ msgstr "" msgid "Not locked" msgstr "잠기지 않음" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "CD-ROM 마운트 위치로 %s 사용\n" +#~ "CD-ROM을 마운트하는 중입니다\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/ku.po b/po/ku.po index 27b91ba0e..31f7720f0 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -160,7 +160,7 @@ msgstr " Destika pakêtê:" msgid " Version table:" msgstr " Tabloya guhertoyan:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -222,12 +222,12 @@ msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk msgid "Please insert a Disc in the drive and press enter" msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -653,13 +653,13 @@ msgstr "Dîsk nehate dîtin." msgid "File not found" msgstr "Pel nehate dîtin" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "" @@ -918,7 +918,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1217,134 +1217,134 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " û" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1353,7 +1353,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 #, fuzzy msgid "[Y/n]" msgstr "[E/n]" @@ -1362,21 +1362,21 @@ msgstr "[E/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1540,7 +1540,7 @@ msgstr "Nikarî pelê %s veke" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -1841,47 +1841,47 @@ msgstr "" msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -2010,12 +2010,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Nivîsîna pelê %s biserneket" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Girtina pelê %s biserneket" @@ -2394,22 +2394,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "" @@ -2657,7 +2657,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Peldanka '%s' kêm e" @@ -2825,35 +2825,35 @@ msgstr "Mezinahî li hev nayên" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2861,24 +2861,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2914,70 +2914,63 @@ msgstr "Pakêt nehate dîtin %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/cdrom.cc:575 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " +msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" +#: apt-pkg/cdrom.cc:583 +msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" +#: apt-pkg/cdrom.cc:588 +msgid "Waiting for disc...\n" msgstr "" -#: apt-pkg/cdrom.cc:642 -#, c-format -msgid "Using CD-ROM mount point %s\n" +#: apt-pkg/cdrom.cc:597 +msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Etîketa '%s' hatiye dîtin\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -2986,15 +2979,15 @@ msgstr "" "Navê dîskê: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Lîsteyên pakêtan tên jibergirtin..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/lt.po b/po/lt.po index b6d55782a..02bd75fbb 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -158,7 +158,7 @@ msgstr " Paketo susiejimai: " msgid " Version table:" msgstr " Versijų lentelė:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -219,12 +219,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Prašome įdėti diską į įrenginį ir paspausti Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nepavyko pervadinti %s į %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje." @@ -657,12 +657,12 @@ msgstr "Diskas nerastas." msgid "File not found" msgstr "Failas nerastas" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "" @@ -919,7 +919,7 @@ msgid "" "available:\n" msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1229,108 +1229,108 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?" msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " arba" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1338,27 +1338,27 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" @@ -1367,7 +1367,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[T/n]" @@ -1375,21 +1375,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1558,7 +1558,7 @@ msgstr "Nepavyko atverti failo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Nepavyko subprocesui sukurti IPC gijos" @@ -1923,47 +1923,47 @@ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Nežinomas suspaudimo algoritmas „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nepavyko sukurti FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Vidinė klaida, nepavyko sukurti %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Nepavyko Nusk/Įraš į subprocesą/failą" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Skaitymo klaida skaičiuojant MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nepavyko pervadinti %s į %s" @@ -2100,12 +2100,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2483,22 +2483,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -2746,7 +2746,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Trūksta aplanko „%s“" @@ -2917,35 +2917,35 @@ msgstr "Neatitinka dydžiai" msgid "Invalid file format" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2953,24 +2953,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3006,70 +3006,63 @@ msgstr "Nepavyko atverti DB failo %s: %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifikuojama.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Atjungiamas CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Naudojama CD-ROM prijungimo vieta %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Atjungiamas CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Laukiama disko...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Prijungiamas CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifikuojama.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Atjungiamas CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Rasta žymė „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3078,15 +3071,15 @@ msgstr "" "Šio disko pavadinimas: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopijuojami paketų sąrašai..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Rašomas naujas šaltinių sąrašas\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/mr.po b/po/mr.po index d10cf403c..0714bc52d 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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 " @@ -155,7 +155,7 @@ msgstr "पॅकेज (पिन):" msgid " Version table:" msgstr "आवृत्ती कोष्टक:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -253,12 +253,12 @@ msgstr "या तबकडीला कृपया नाव द्या ज msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)" @@ -729,12 +729,12 @@ msgstr "डिस्क सापडत नाही" msgid "File not found" msgstr "फाईल सापडली नाही" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -995,7 +995,7 @@ msgid "" "available:\n" msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1312,108 +1312,108 @@ msgstr "पडताळून पाहिल्याशिवाय ही प msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr "किंवा" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1421,27 +1421,27 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" @@ -1450,7 +1450,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1458,21 +1458,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "होय" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -1640,7 +1640,7 @@ msgstr "%s फाईल उघडता येत नाही" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" @@ -1996,47 +1996,47 @@ msgstr "व्यंगीत/हिडीस दुर्लक्षित क msgid "Malformed override %s line %llu #3" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "संचिका * तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO ची उपक्रिया/संचिका असमर्थ " -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " @@ -2172,12 +2172,12 @@ msgstr "%s -> %s डायव्हर्जन दुप्पट मिळव msgid "Duplicate conf file %s/%s" msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s फाईल बंद करण्यास असमर्थ" @@ -2554,22 +2554,22 @@ msgstr "वाचा, %lu अजूनही वाचण्यासाठी msgid "write, still have %llu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "संचिकेची syncing समस्या" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2824,7 +2824,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "संचयिका यादीत %s पार्शल हरवले आहे." @@ -2998,35 +2998,35 @@ msgstr "आकार जुळतनाही" msgid "Invalid file format" msgstr "%s अवैध क्रिया" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3034,12 +3034,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3048,12 +3048,12 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3091,50 +3091,41 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Vendor block %s contains no fingerprint" msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"सिडी-रॉमचे माउंट स्थान %s वापरुन\n" -"सिडी-रॉम माउंट होत आहे\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "ओळखत आहे.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "ग्रहण केलेले नामदर्शक: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "सिडी-रॉम अनमाउंट करत आहे\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "सिडी-रॉम माउंट होत आहे...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "ओळखत आहे.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "ग्रहण केलेले नामदर्शक: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3143,22 +3134,22 @@ msgstr "" "%zu पॅकेजेसची यादी/सूची, %zu स्त्रोताची यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu " "स्वाक्षऱ्या/सिगनेचर्स सापडल्या\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "'%s' लेबल सापडले\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "ते स्विकारण्याजोगे/वैध नांव नाही, पुन्हा प्रयत्न करा.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3167,15 +3158,15 @@ msgstr "" "ह्या डिस्कला/चकतीला: म्हणतात\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "नविन स्त्रोत सूची लिहित आहे\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" @@ -3458,6 +3449,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" +#~ "सिडी-रॉम माउंट होत आहे\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" diff --git a/po/nb.po b/po/nb.po index a452f57b5..5249ddabc 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -160,7 +160,7 @@ msgstr " Pakke låst til: " msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»" msgid "Please insert a Disc in the drive and press enter" msgstr "Sett inn en disk i lagringsenheten og trykk Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikke montere «%s» på «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett." @@ -746,12 +746,12 @@ msgstr "Disk ikke funnet." msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -1013,7 +1013,7 @@ msgstr "" "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen " "ikke er tilgjengelig:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1333,108 +1333,108 @@ msgstr "Installer disse pakkene uten verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men er ikke installert" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1442,27 +1442,27 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" @@ -1471,7 +1471,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1479,21 +1479,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -1665,7 +1665,7 @@ msgstr "Ingen speilfil «%s» funnet" msgid "[Mirror: %s]" msgstr "[Speil: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" @@ -2022,47 +2022,47 @@ msgstr "Ugyldig overstyring %s linje %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Ugyldig overstyring %s linje %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjent komprimeringsalgoritme «%s»" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s trenger et komprimeringssett" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Klarte ikke å opprette FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Klarte ikke å forgreine prosess" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimer barneprosess" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikke å opprette %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Klarte ikke å kommunisere med underprosess/fil" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Klarte ikke å lese under utregning av MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" @@ -2198,12 +2198,12 @@ msgstr "Dobbel tillegging av avledning %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Klarte ikke å skrive fila %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" @@ -2584,22 +2584,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem ved låsing av fila %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenke til fila %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2856,7 +2856,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappa %spartial mangler." @@ -3027,36 +3027,36 @@ msgstr "Feil størrelse" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3066,12 +3066,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3080,12 +3080,12 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3121,50 +3121,41 @@ msgstr "Ugyldig «Date»-oppføring i Release-fila %s" msgid "Vendor block %s contains no fingerprint" msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Bruker CD-ROM monteringspunkt %s\n" -"Monterer CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Indentifiserer.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Lagret merkelapp: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Venter på CD-en...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Indentifiserer.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Lagret merkelapp: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Leter gjennom CD for indeksfiler..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3173,7 +3164,7 @@ msgstr "" "Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3181,16 +3172,16 @@ msgstr "" "Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc " "eller du har valgt feil arkitektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Fant merkelapp «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldig navn, prøv igjen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3199,15 +3190,15 @@ msgstr "" "CD-en er kalt: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" @@ -3508,6 +3499,13 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet," msgid "Not locked" msgstr "Ikke låst" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Bruker CD-ROM monteringspunkt %s\n" +#~ "Monterer CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/ne.po b/po/ne.po index e627077a0..a8fa67496 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -158,7 +158,7 @@ msgstr "प्याकेज पिन:" msgid " Version table:" msgstr " संस्करण तालिका:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "कृपया यो डिस्कको लागि नाम उ msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । " @@ -731,12 +731,12 @@ msgstr "डिस्क फेला परेन ।" msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -996,7 +996,7 @@ msgid "" "available:\n" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1309,108 +1309,108 @@ msgstr "यी प्याकेजहरू रूजू बिना स् msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr "वा" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1418,27 +1418,27 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" @@ -1447,7 +1447,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1455,21 +1455,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -1637,7 +1637,7 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" @@ -1993,47 +1993,47 @@ msgstr "वैरुप्य गरिएको अधिलेखन %s र msgid "Malformed override %s line %llu #3" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "काँटा गर्न असफल" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "सङ्कुचन शाखा" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 गणना गर्दा पढ्न असफल भयो" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr " %s मा %s पुन:नामकरण असफल भयो" @@ -2168,12 +2168,12 @@ msgstr "मोडको डबल थप %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s फाइल बन्द गर्न असफल भयो" @@ -2551,22 +2551,22 @@ msgstr "पड्नुहोस्, अहिले सम्म %lu पढ् msgid "write, still have %llu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2821,7 +2821,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" @@ -2992,35 +2992,35 @@ msgstr "साइज मेल खाएन" msgid "Invalid file format" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3028,12 +3028,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3042,12 +3042,12 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3083,73 +3083,64 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Vendor block %s contains no fingerprint" msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" -"सिडी रोम माउन्ट गरिदैछ\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "परिचय गराइदैछ.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "सिडी रोम अनमाउन्ट गरिदैछ\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "डिस्को लागि पर्खिदै...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "सिडी रोम माउन्ट गरिदै...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "परिचय गराइदैछ.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i हस्ताक्षरहरू फेला परे\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "त्यो वैध नाम होइन, फेरी प्रयास गर्नुहोस् ।\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3158,15 +3149,15 @@ msgstr "" "यो डिस्कको नाम:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" @@ -3449,6 +3440,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" +#~ "सिडी रोम माउन्ट गरिदैछ\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" diff --git a/po/nl.po b/po/nl.po index f9768da25..157f67583 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -158,7 +158,7 @@ msgstr " Pakketpin: " msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -258,12 +258,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Aankoppelen van '%s' op '%s' is mislukt" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set." @@ -757,12 +757,12 @@ msgstr "Schijf niet gevonden" msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1027,7 +1027,7 @@ msgstr "" "De volgende ondertekeningen konden niet geverifieerd worden omdat de " "publieke sleutel niet beschikbaar is:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1353,108 +1353,108 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?" msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " of" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1462,27 +1462,27 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" @@ -1491,7 +1491,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1499,21 +1499,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -1685,7 +1685,7 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" @@ -2048,47 +2048,47 @@ msgstr "Misvormde voorrangsingang %s op regel %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Misvormde voorrangsingang %s op regel %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Onbekend compressie-algoritme '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Gecomprimeerde uitvoer %s vereist een compressieset" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Aanmaken van FILE* is mislukt" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Vorken van proces is mislukt" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimeer kind" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Interne fout, aanmaken van %s is mislukt" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO naar subproces/bestand is mislukt" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" @@ -2224,12 +2224,12 @@ msgstr "Dubbele toevoeging van de omleiding %s->%s" msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" @@ -2618,22 +2618,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2893,7 +2893,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." @@ -3074,36 +3074,36 @@ msgstr "Grootte komt niet overeen" msgid "Invalid file format" msgstr "Ongeldige operatie %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3114,12 +3114,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3128,12 +3128,12 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3171,50 +3171,41 @@ msgstr "Geen 'Date'-vermelding in Release-bestand %s" msgid "Vendor block %s contains no fingerprint" msgstr "Verkopersblok %s bevat geen vingerafdruk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -"CD wordt aangekoppeld\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificatie..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Opgeslagen label: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD wordt afgekoppeld...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD wordt losgekoppeld\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificatie..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Opgeslagen label: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD wordt afgekoppeld...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Er wordt gescand voor indexbestanden...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3223,7 +3214,7 @@ msgstr "" "Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu " "handtekeningen gevonden\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3231,16 +3222,16 @@ msgstr "" "Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de " "verkeerde architectuur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Label '%s' gevonden\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3249,15 +3240,15 @@ msgstr "" "De schijf heet:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" @@ -3567,6 +3558,13 @@ msgstr "" msgid "Not locked" msgstr "Niet vergrendeld" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" +#~ "CD wordt aangekoppeld\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/nn.po b/po/nn.po index 0ef1b50ec..37c373e18 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -160,7 +160,7 @@ msgstr " Pakke spikra til: " msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -261,12 +261,12 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikkje endra namnet p %s til %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -740,12 +740,12 @@ msgstr "Fann ikkje fila" msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1005,7 +1005,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1318,108 +1318,108 @@ msgstr "Installer desse pakkane utan verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men er ikkje installert" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1428,27 +1428,27 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" @@ -1457,7 +1457,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1465,21 +1465,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -1648,7 +1648,7 @@ msgstr "Klarte ikkje opna fila %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" @@ -1999,47 +1999,47 @@ msgstr "Misforma overstyring %s linje %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Misforma overstyring %s linje %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjend komprimeringsalgoritme %s" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s treng eit komprimeringssett" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Klarte ikkje oppretta FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Klarte ikkje gafla" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikkje oppretta %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Klarte ikkje lesa under utrekning av MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" @@ -2174,12 +2174,12 @@ msgstr "Dobbel tilleggjing av avleiing %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" @@ -2557,22 +2557,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2829,7 +2829,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Listekatalogen %spartial manglar." @@ -3004,35 +3004,35 @@ msgstr "Feil storleik" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3040,12 +3040,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3054,12 +3054,12 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3096,73 +3096,64 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Brukar monteringspunktet %s for CD-ROM\n" -"Monterer CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifiserer ... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Lagra etikett: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Ventar p disk ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifiserer ... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Lagra etikett: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Leitar etter indeksfiler p disken ...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Det er ikkje eit gyldig namn, prv igjen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3171,15 +3162,15 @@ msgstr "" "Disken vert kalla: \n" "%s\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" @@ -3462,6 +3453,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Brukar monteringspunktet %s for CD-ROM\n" +#~ "Monterer CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Merk, vel %s i staden for regex %s\n" diff --git a/po/pl.po b/po/pl.po index a1e4c2aec..79e0a0470 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -162,7 +162,7 @@ msgstr " Sposób przypięcia: " msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Proszę włożyć dysk do napędu i nacisnąć enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nie udało się zamontować \"%s\" w \"%s\"" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Należy powtórzyć ten proces dla reszty płyt." @@ -784,12 +784,12 @@ msgstr "Nie odnaleziono dysku." msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -1055,7 +1055,7 @@ msgstr "" "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza " "publicznego:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogą być prawidłowymi archiwami" @@ -1391,108 +1391,108 @@ msgstr "Zainstalować te pakiety bez weryfikacji?" msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " lub" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1500,27 +1500,27 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" @@ -1529,7 +1529,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[T/n]" @@ -1537,21 +1537,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -1727,7 +1727,7 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" @@ -2086,47 +2086,47 @@ msgstr "Nieprawidłowa linia %llu #2 pliku override %s" msgid "Malformed override %s line %llu #3" msgstr "Nieprawidłowa linia %llu #3 pliku override %s" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Nieznany algorytm kompresji \"%s\"" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nie udało się utworzyć obiektu FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Nie udało się utworzyć procesu potomnego" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Potomny proces kompresujący" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Zawiodła operacja IO na pliku/podprocesie" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nie udało się zmienić nazwy %s na %s" @@ -2261,12 +2261,12 @@ msgstr "Podwójne dodanie ominięcia %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Nie udało się zapisać pliku %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Nie udało się zamknąć pliku %s" @@ -2654,22 +2654,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2930,7 +2930,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." @@ -3102,7 +3102,7 @@ msgstr "Błędny rozmiar" msgid "Invalid file format" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3111,16 +3111,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3129,12 +3129,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3144,12 +3144,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3158,12 +3158,12 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3200,50 +3200,41 @@ msgstr "Nieprawidłowy wpis Date w pliku Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "Blok producenta %s nie zawiera odcisku" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Użycie %s jako punktu montowania CD-ROM-u\n" -"Montowanie CD-ROM-u\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identyfikacja.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etykieta: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Odmontowanie CD-ROM-u...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Użycie %s jako punktu montowania CD-ROM-u\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Odmontowanie CD-ROM-u\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Oczekiwanie na płytę...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROM-u...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identyfikacja.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etykieta: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Odmontowanie CD-ROM-u...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3252,7 +3243,7 @@ msgstr "" "Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów " "tłumaczeń i %zu podpisów\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3260,16 +3251,16 @@ msgstr "" "Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk " "Debiana lub jest to inna architektura?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Znaleziono etykietę \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "To nie jest prawidłowa nazwa, proszę spróbować ponownie.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3278,15 +3269,15 @@ msgstr "" "Płyta nosi nazwę: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopiowanie list pakietów..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy źródeł\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" @@ -3598,6 +3589,13 @@ msgstr "" msgid "Not locked" msgstr "Niezablokowany" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Użycie %s jako punktu montowania CD-ROM-u\n" +#~ "Montowanie CD-ROM-u\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/pt.po b/po/pt.po index 8c6f82bad..ce7d19cf7 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -158,7 +158,7 @@ msgstr " Marcação do Pacote: " msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor insira um Disco no leitor e pressione enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falhou ao montar '%s' para '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este processo para o resto dos CDs no seu conjunto." @@ -777,12 +777,12 @@ msgstr "Disco não encontrado." msgid "File not found" msgstr "Ficheiro não encontrado" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -1047,7 +1047,7 @@ msgstr "" "As seguintes assinaturas não puderam ser verificadas porque a chave pública " "não está disponível:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios não podem ser arquivos válidos" @@ -1367,108 +1367,108 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1476,27 +1476,27 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1505,7 +1505,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1513,21 +1513,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1699,7 +1699,7 @@ msgstr "Não pode ler ficheiro de mirror '%s'" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" @@ -2058,47 +2058,47 @@ msgstr "Override %s malformado linha %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Override %s malformado linha %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compressão desconhecido '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compressão" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Falhou criar FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Falhou o fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Compactar filho" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro Interno, falhou criar %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Falhou o IO para subprocesso/arquivo" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Falhou ler durante o cálculo de MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou renomear %s para %s" @@ -2233,12 +2233,12 @@ msgstr "Adição dupla de desvio %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falhou escrever o ficheiro %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Falhou fechar o ficheiro %s" @@ -2630,22 +2630,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2908,7 +2908,7 @@ msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta directório de listas %spartial." @@ -3089,7 +3089,7 @@ msgstr "Tamanho incorrecto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3098,18 +3098,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3118,12 +3118,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3134,12 +3134,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3149,12 +3149,12 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3192,50 +3192,41 @@ msgstr "Entrada, 'Date', inválida no ficheiro Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "O bloco de fabricante %s não contém a impressão digital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Utilizando o ponto de montagem do CD-ROM %s\n" -"A montar o CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "A identificar.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Label Guardada: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "A desmontar o CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A utilizar o ponto de montagem do CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "A identificar.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Label Guardada: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "A desmontar o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "A pesquisar os ficheiros de índice do disco..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3244,7 +3235,7 @@ msgstr "" "Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu " "índices de tradução e %zu assinaturas\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3252,16 +3243,16 @@ msgstr "" "Não foi possível localizar quaisquer ficheiros de pacote, talvez este não " "seja um disco Debian ou seja a arquitectura errada?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Encontrada a etiqueta '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Isso não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3270,15 +3261,15 @@ msgstr "" "Este disco tem o nome: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" @@ -3588,6 +3579,13 @@ msgstr "" msgid "Not locked" msgstr "Sem acesso exclusivo" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Utilizando o ponto de montagem do CD-ROM %s\n" +#~ "A montar o CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/pt_BR.po b/po/pt_BR.po index c2211ccd0..6d0e09792 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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." @@ -158,7 +158,7 @@ msgstr " Pacote alfinetado (\"pin\"): " msgid " Version table:" msgstr " Tabela de versão:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor, insira um Disco na unidade e pressione enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falhou ao renomear %s para %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este processo para o restante dos CDs em seu conjunto." @@ -748,12 +748,12 @@ msgstr "Disco não encontrado." msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" @@ -1019,7 +1019,7 @@ msgstr "" "As assinaturas a seguir não puderam ser verificadas devido à chave pública " "não estar disponível:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1342,108 +1342,108 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mas não será instalado" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1452,27 +1452,27 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1481,7 +1481,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1489,21 +1489,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1671,7 +1671,7 @@ msgstr "Não foi possível abrir arquivo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Falhou ao criar pipe IPC para sub-processo" @@ -2034,47 +2034,47 @@ msgstr "Override malformado %s linha %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Override malformado %s linha %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compactação desconhecido '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compactação" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Falhou ao criar FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Falhou ao executar \"fork\"" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Compactar filho" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro interno, falhou ao criar %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "E/S para sub-processo/arquivo falhou" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Falhou ao ler durante o cálculo MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema removendo %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou ao renomear %s para %s" @@ -2211,12 +2211,12 @@ msgstr "Adição dupla de desvio %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falhou ao escrever arquivo %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Falhou ao fechar arquivo %s" @@ -2596,22 +2596,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -2873,7 +2873,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Diretório de listas %spartial está faltando." @@ -3051,35 +3051,35 @@ msgstr "Tamanho incorreto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3087,12 +3087,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3102,12 +3102,12 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3145,50 +3145,41 @@ msgstr "Impossível analisar arquivo de pacote %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Usando ponto de montagem de CD-ROM %s\n" -"Montando CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Rótulo armazenado: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Aguardando por disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Rótulo armazenado: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Procurando por arquivos de índice no disco..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3197,22 +3188,22 @@ msgstr "" "Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu " "índice(s) de traduções e %zu assinatura(s)\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Rótulo encontrado: '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3221,15 +3212,15 @@ msgstr "" "Esse disco é chamado: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" @@ -3514,6 +3505,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Usando ponto de montagem de CD-ROM %s\n" +#~ "Montando CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Nota, selecionando %s para expressão regular '%s'\n" diff --git a/po/ro.po b/po/ro.po index 5ff851765..a89a9131f 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -159,7 +159,7 @@ msgstr " Pachet ales special: " msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1 msgid "Please insert a Disc in the drive and press enter" msgstr "Introduceți un disc în unitate și apăsați Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Eșec la redenumirea lui %s în %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetați această procedură pentru restul CD-urilor din set." @@ -747,12 +747,12 @@ msgstr "Disc negăsit." msgid "File not found" msgstr "Fișier negăsit" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -1020,7 +1020,7 @@ msgstr "" "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu " "este disponibilă:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1348,108 +1348,108 @@ msgstr "Instalați aceste pachete fără verificare?" msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalat]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "dar nu este instalat" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " sau" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1457,27 +1457,27 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" @@ -1486,7 +1486,7 @@ msgstr "%lu instalate sau șterse incomplet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1494,21 +1494,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -1677,7 +1677,7 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" @@ -2042,47 +2042,47 @@ msgstr "Înlocuire greșită %s linia %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Înlocuire greșită %s linia %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritm de compresie necunoscut '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Eșec la crearea FIȘIERULUI*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Eșec la „fork”" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimare copil" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Eroare internă, eșec la crearea lui %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IE către subproces/fișier eșuat" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Eșec la citire în timpul calculului sumei MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Eșec la redenumirea lui %s în %s" @@ -2220,12 +2220,12 @@ msgstr "Adăugare dublă de redirectare %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fișier „conf” duplicat %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Eșec la scrierea fișierului %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Eșec la închiderea fișierului %s" @@ -2606,22 +2606,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2877,7 +2877,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Directorul de liste %spartial lipsește." @@ -3056,37 +3056,37 @@ msgstr "Nepotrivire dimensiune" msgid "Invalid file format" msgstr "Operațiune invalidă %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3094,12 +3094,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3108,12 +3108,12 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3151,51 +3151,42 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Blocul vânzător %s nu conține amprentă" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Utilizare puct de montare CD-ROM %s\n" -"Montare CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificare.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etichetă memorată: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Se demontează CD-ul...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilizare punct de montare CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Demontare CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Aștept discul...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montez CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificare.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etichetă memorată: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Se demontează CD-ul...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Scanez discul de fișierele index..\n" # DEVELOPERS: please consider using somehow plural forms -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3204,22 +3195,22 @@ msgstr "" "Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri " "de traduceri și %zu semnături\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "A fost găsită eticheta „%s”\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Acesta nu este un nume valid, mai încercați.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3228,15 +3219,15 @@ msgstr "" "Acest disc este numit: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" @@ -3520,6 +3511,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Utilizare puct de montare CD-ROM %s\n" +#~ "Montare CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" diff --git a/po/ru.po b/po/ru.po index 786621f57..c4faf8f62 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -163,7 +163,7 @@ msgstr " Фиксатор пакета: " msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "Задайте имя для этого диска, например «D msgid "Please insert a Disc in the drive and press enter" msgstr "Вставьте диск в устройство и нажмите ввод" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не удалось примонтировать «%s» к «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторите этот процесс для всех имеющихся CD." @@ -782,12 +782,12 @@ msgstr "Диск не найден." msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1054,7 +1054,7 @@ msgstr "" "Следующие подписи не могут быть проверены, так как недоступен открытый " "ключ:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Пустые файлы не могут быть допустимыми архивами" @@ -1385,109 +1385,109 @@ msgstr "Установить эти пакеты без проверки?" msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Установлен]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Установлен]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Установлен]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Установлен]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "но он не установлен" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " или" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1495,27 +1495,27 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" @@ -1524,7 +1524,7 @@ msgstr "не установлено до конца или удалено %lu п #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Д/н]" @@ -1532,21 +1532,21 @@ msgstr "[Д/н]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "д" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "н" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" @@ -1721,7 +1721,7 @@ msgstr "Невозможно прочитать файл на зеркале «% msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" @@ -2082,48 +2082,48 @@ msgstr "Неправильная запись о переназначении (o msgid "Malformed override %s line %llu #3" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Неизвестный алгоритм сжатия «%s»" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" "Для получения сжатого вывода %s необходимо включить использования сжатия" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Не удалось создать FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Не удалось запустить порождённый процесс" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Процесс-потомок, производящий сжатие" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутренняя ошибка, не удалось создать %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Ошибка чтения во время вычисления MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" @@ -2258,12 +2258,12 @@ msgstr "Двойное добавление diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Повторно указан файл настройки %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" @@ -2655,22 +2655,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Проблема закрытия файла %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема при удалении файла %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файла" @@ -2932,7 +2932,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Каталог списка %spartial отсутствует." @@ -3109,7 +3109,7 @@ msgstr "Не совпадает размер" msgid "Invalid file format" msgstr "Неверная операция %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3118,16 +3118,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3136,12 +3136,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3151,12 +3151,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3165,12 +3165,12 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3206,50 +3206,41 @@ msgstr "Неправильный элемент «Date» в файле Release % msgid "Vendor block %s contains no fingerprint" msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"В качестве точки монтирования CD-ROM используется %s\n" -"Монтируется CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Идентификация.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Найдена метка: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Размонтирование CD-ROM…\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Размонтирование CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском…\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM…\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Идентификация.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Найдена метка: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Размонтирование CD-ROM…\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Поиск на диске индексных файлов..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3258,7 +3249,7 @@ msgstr "" "Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и " "%zu для сигнатур\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3266,16 +3257,16 @@ msgstr "" "Не удалось найти ни одного файла пакетов; возможно это не диск Debian или с " "не той архитектурой?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Найден ярлык «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3284,15 +3275,15 @@ msgstr "" "Название диска: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Копирование списков пакетов…" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" @@ -3602,6 +3593,13 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "В качестве точки монтирования CD-ROM используется %s\n" +#~ "Монтируется CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/sk.po b/po/sk.po index 6d55616b7..495b096d4 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -159,7 +159,7 @@ msgstr " Pripevnený balík:" msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1 msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte disk do mechaniky a stlačte Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Pripojenie „%s“ na „%s“ zlyhalo" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Zopakujte tento postup pre všetky CD v sade diskov." @@ -768,12 +768,12 @@ msgstr "Disk sa nenašiel." msgid "File not found" msgstr "Súbor sa nenašiel" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1034,7 +1034,7 @@ msgstr "" "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " "kľúč:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Prázdne súbory nemôžu byť platné archívy" @@ -1362,108 +1362,108 @@ msgstr "Nainštalovať tieto nekontrolované balíky?" msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " alebo" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1471,27 +1471,27 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" @@ -1500,7 +1500,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1508,21 +1508,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -1695,7 +1695,7 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" @@ -2048,47 +2048,47 @@ msgstr "Skomolený „override“ %s riadok %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Skomolený „override“ %s riadok %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámy kompresný algoritmus „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Zlyhalo vytvorenie FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Volanie fork() zlyhalo" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimovať potomka" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Chyba čítania pri výpočte MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" @@ -2222,12 +2222,12 @@ msgstr "Dvojité pridanie diverzie %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" @@ -2610,22 +2610,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problém pri zatváraní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém pri odstraňovaní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -2881,7 +2881,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Adresár zoznamov %spartial chýba." @@ -3054,7 +3054,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Invalid file format" msgstr "Neplatná operácia %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3063,16 +3063,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3081,12 +3081,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3096,12 +3096,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3110,12 +3110,12 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3151,50 +3151,41 @@ msgstr "Chýba položka „Date“ v súbore Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Použije sa CD-ROM prípojný bod %s\n" -"Pripája sa CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifikuje sa.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Uložená menovka: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM sa odpája...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Použije sa prípojný bod CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM sa odpája\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifikuje sa.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Uložená menovka: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM sa odpája...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Na disku sa hľadajú indexové súbory..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3203,7 +3194,7 @@ msgstr "" "Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov " "prekladov a %zu signatúr\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3211,16 +3202,16 @@ msgstr "" "Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom " "alebo je pre nesprávnu architektúru?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Nájdená menovka: „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Neplatný názov, skúste znova.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3229,15 +3220,15 @@ msgstr "" "Názov tohto disku je: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" @@ -3536,6 +3527,13 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s msgid "Not locked" msgstr "Nie je zamknuté" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Použije sa CD-ROM prípojný bod %s\n" +#~ "Pripája sa CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/sl.po b/po/sl.po index 5ece639cc..a0ee37460 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -157,7 +157,7 @@ msgstr " Bucika paketa: " msgid " Version table:" msgstr " Preglednica različic:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -252,12 +252,12 @@ msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Vstavite disk v pogon in pritisnite vnosno tipko" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Priklapljanje '%s' na '%s' je spodletelo" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki." @@ -763,12 +763,12 @@ msgstr "Diska ni mogoče najti." msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -1029,7 +1029,7 @@ msgid "" msgstr "" "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" @@ -1361,108 +1361,108 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?" msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ali" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1470,27 +1470,27 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" @@ -1499,7 +1499,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1507,21 +1507,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" @@ -1695,7 +1695,7 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" @@ -2049,47 +2049,47 @@ msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" msgid "Malformed override %s line %llu #3" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznan algoritem stiskanja '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Stisnjen izhod %s potrebuje niz stiskanja" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Ustvarjanje DATOTEKE* ni uspelo" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Vejitev ni uspela" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Podrejeni predmet stiskanja" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Notranja napaka. Ni mogoče ustvariti %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "VI podopravila/datoteke je spodletel" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Med računanjem MD5 ni mogoče brati" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Napaka med odvezovanjem %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoče preimenovati %s v %s" @@ -2225,12 +2225,12 @@ msgstr "Dvojni seštevek odklona %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Zapisovanje datoteke %s je spodletelo" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Napaka med zapiranjem datoteke %s" @@ -2612,22 +2612,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Težava med usklajevanjem datoteke" @@ -2888,7 +2888,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Mapa seznama %spartial manjka." @@ -3059,7 +3059,7 @@ msgstr "Neujemanje velikosti" msgid "Invalid file format" msgstr "Neveljavno opravilo %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3068,16 +3068,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3086,12 +3086,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3101,12 +3101,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3115,12 +3115,12 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3158,50 +3158,41 @@ msgstr "Neveljavne vnos 'Datum' v Release datoteki %s" msgid "Vendor block %s contains no fingerprint" msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Uporabljanje CD-ROM-ove priklopne točke %s\n" -"Priklapljanje CD-ROM-a\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificiranje ... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Shranjena oznaka: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Odklapljanje CD-ROM-a ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljanje CD-ROM-ove priklopne točke %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Odklapljanje CD-ROM-a\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čakanje na disk ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Priklapljanje CD-ROM-a ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificiranje ... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Shranjena oznaka: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Odklapljanje CD-ROM-a ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Preiskovanje diska za datoteke kazala ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3210,7 +3201,7 @@ msgstr "" "Najdenih je bilo %zu kazal paketov, %zu kazal virov, %zu kazalov prevodov in " "%zu podpisov\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3218,16 +3209,16 @@ msgstr "" "Nobenih datotek paketov ni mogoče najti, morda to ni disk Debian ali pa je " "arhitektura napačna?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Najdena je bila oznaka '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "To ni veljavno ime, poskusite znova.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3236,15 +3227,15 @@ msgstr "" "Ta disk se imenuje: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Pisanje novega seznama virov\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" @@ -3544,6 +3535,13 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. " msgid "Not locked" msgstr "Ni zaklenjeno" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Uporabljanje CD-ROM-ove priklopne točke %s\n" +#~ "Priklapljanje CD-ROM-a\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/sv.po b/po/sv.po index 298573eea..fda0cac14 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -157,7 +157,7 @@ msgstr " Paketnålning: " msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -255,12 +255,12 @@ msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Mata in en skiva i enheten och tryck på Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Misslyckades med att montera \"%s\" till \"%s\"" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning." @@ -747,12 +747,12 @@ msgstr "Skivan hittades inte." msgid "File not found" msgstr "Filen hittades inte" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -1021,7 +1021,7 @@ msgstr "" "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är " "tillgänglig:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1345,108 +1345,108 @@ msgstr "Installera dessa paket utan verifiering?" msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installerat]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installerat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installerat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installerat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men det är inte installerat" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1454,27 +1454,27 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" @@ -1483,7 +1483,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1491,21 +1491,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -1683,7 +1683,7 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "[Mirror: %s]" msgstr "[Spegel: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" @@ -2044,48 +2044,48 @@ msgstr "Felaktig override %s rad %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Okänd komprimeringsalgoritm \"%s\"" # ??? -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Misslyckades med att skapa FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Misslyckades med att grena process" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Barnprocess för komprimering" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Internt fel, misslyckades med att skapa %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "In/ut för underprocess/fil misslyckades" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Misslyckades med att läsa vid beräkning av MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn på %s till %s" @@ -2220,12 +2220,12 @@ msgstr "Omdirigeringen %s -> %s inlagd två gånger" msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades med att skriva filen %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades med att stänga filen %s" @@ -2607,22 +2607,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem med att stänga filen %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, 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:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem med att avlänka filen %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2883,7 +2883,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." @@ -3057,35 +3057,35 @@ msgstr "Storleken stämmer inte" msgid "Invalid file format" msgstr "Felaktig åtgärd %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3096,12 +3096,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3110,12 +3110,12 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3151,50 +3151,41 @@ msgstr "Ogiltig \"Date\"-post i Release-filen %s" msgid "Vendor block %s contains no fingerprint" msgstr "Leverantörsblocket %s saknar fingeravtryck" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Använder cd-rom-monteringspunkten %s\n" -"Monterar cd-rom\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifierar.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Lagrad etikett: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterar cd-rom...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Använder cd-rom-monteringspunkten %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Avmonterar cd-rom\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Väntar på skiva...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifierar.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Lagrad etikett: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterar cd-rom...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Söker efter indexfiler på skivan...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3203,7 +3194,7 @@ msgstr "" "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3211,16 +3202,16 @@ msgstr "" "Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva " "eller felaktig arkitektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Hittade etiketten \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Namnet är ogiltigt, försök igen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3229,15 +3220,15 @@ msgstr "" "Denna skiva heter: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriver ny källista\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" @@ -3542,6 +3533,13 @@ msgstr "" msgid "Not locked" msgstr "Inte låst" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Använder cd-rom-monteringspunkten %s\n" +#~ "Monterar cd-rom\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/th.po b/po/th.po index 263830ef1..83ee7e98f 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -155,7 +155,7 @@ msgstr " การตรึงแพกเกจ: " msgid " Version table:" msgstr " ตารางรุ่น:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -249,12 +249,12 @@ msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian msgid "Please insert a Disc in the drive and press enter" msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด" @@ -749,12 +749,12 @@ msgstr "ไม่พบแผ่น" msgid "File not found" msgstr "ไม่พบแฟ้ม" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -1011,7 +1011,7 @@ msgid "" "available:\n" msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้" @@ -1318,108 +1318,108 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " หรือ" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1427,27 +1427,27 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" @@ -1456,7 +1456,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1464,21 +1464,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -1649,7 +1649,7 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" @@ -1995,47 +1995,47 @@ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรร msgid "Malformed override %s line %llu #3" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "สร้าง FILE* ไม่สำเร็จ" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork ไม่สำเร็จ" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "โพรเซสลูกสำหรับบีบอัด" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" @@ -2170,12 +2170,12 @@ msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง" msgid "Duplicate conf file %s/%s" msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "ไม่สามารถเขียนแฟ้ม %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "ไม่สามารถปิดแฟ้ม %s" @@ -2552,22 +2552,22 @@ msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้ msgid "write, still have %llu to write but couldn't" msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2823,7 +2823,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial" @@ -2992,7 +2992,7 @@ msgstr "ขนาดไม่ตรงกัน" msgid "Invalid file format" msgstr "ไม่รู้จักคำสั่ง %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3001,16 +3001,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3019,12 +3019,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3034,24 +3034,24 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3087,50 +3087,41 @@ msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ msgid "Vendor block %s contains no fingerprint" msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"กำลังใช้จุดเมานท์ซีดีรอม %s\n" -"กำลังเมานท์ซีดีรอม\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "กำลังตรวจสอบชื่อแผ่น.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "ชื่อที่เก็บไว้: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "กำลังเลิกเมานท์ซีดีรอม\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "กำลังรอแผ่น...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "กำลังเมานท์ซีดีรอม...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "กำลังตรวจสอบชื่อแผ่น.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "ชื่อที่เก็บไว้: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3139,22 +3130,22 @@ msgstr "" "พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น " "%zu รายการ\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "ไม่พบแฟ้มแพกเกจใดๆ บางทีแผ่นนี้อาจจะไม่ใช่แผ่นเดเบียน หรือสถาปัตยกรรมอาจไม่ถูกต้อง" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "พบชื่อแผ่น '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "ไม่ใช่ชื่อที่ใช้ได้ กรุณาลองใหม่\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3163,15 +3154,15 @@ msgstr "" "แผ่นนี้เรียกชื่อว่า:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "กำลังคัดลอกรายชื่อแพกเกจ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" @@ -3455,6 +3446,13 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี msgid "Not locked" msgstr "ไม่ได้ล็อคอยู่" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "กำลังใช้จุดเมานท์ซีดีรอม %s\n" +#~ "กำลังเมานท์ซีดีรอม\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/tl.po b/po/tl.po index 180f2732e..a320e92fa 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -161,7 +161,7 @@ msgstr " Naka-Pin na Pakete: " msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -262,12 +262,12 @@ msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set." @@ -744,12 +744,12 @@ msgstr "Hindi nahanap ang Disk." msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1014,7 +1014,7 @@ msgstr "" "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " "available:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1332,108 +1332,108 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1441,27 +1441,27 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" @@ -1470,7 +1470,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[O/h]" @@ -1478,21 +1478,21 @@ msgstr "[O/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[o/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "H" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -1660,7 +1660,7 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" @@ -2022,47 +2022,47 @@ msgstr "Maling anyo ng override %s linya %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Maling anyo ng override %s linya %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Hindi kilalang algorithmong compression '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Kailangan ng compression set ang compressed output %s" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Bigo ang paglikha ng FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Bigo ang pag-fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Anak para sa pag-Compress" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Error na internal, bigo ang paglikha ng %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Bigo ang IO sa subprocess/talaksan" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" @@ -2198,12 +2198,12 @@ msgstr "Dobleng pagdagdag ng diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Nadobleng talaksang conf %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" @@ -2588,22 +2588,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2862,7 +2862,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Nawawala ang directory ng talaan %spartial." @@ -3039,35 +3039,35 @@ msgstr "Di tugmang laki" msgid "Invalid file format" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3075,12 +3075,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3089,12 +3089,12 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3132,51 +3132,42 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Block ng nagbebenta %s ay walang fingerprint" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Ginagamit ang %s bilang mount point ng CD-ROM\n" -"Sinasalang ang CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Kinikilala..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Naka-imbak na Label: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Ina-unmount ang CD-ROM..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Ina-unmount ang CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Kinikilala..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Naka-imbak na Label: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Ina-unmount ang CD-ROM..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3185,22 +3176,22 @@ msgstr "" "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " "signature\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Hindi yan tanggap na pangalan, subukan muli.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3209,15 +3200,15 @@ msgstr "" "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" @@ -3502,6 +3493,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Ginagamit ang %s bilang mount point ng CD-ROM\n" +#~ "Sinasalang ang CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" diff --git a/po/tr.po b/po/tr.po index b1bb0f17d..0ea96fe86 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -159,7 +159,7 @@ msgstr " Paket sabitleme: " msgid " Version table:" msgstr " Sürüm çizelgesi:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -255,12 +255,12 @@ msgstr "Lütfen bu CD/DVD'ye bir isim verin, örneğin 'Debian 5.0.3 Disk 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s', '%s' konumuna bağlanamadı" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Kalan CD'leriniz için bu işlemi yineleyin." @@ -770,12 +770,12 @@ msgstr "Disk bulunamadı." msgid "File not found" msgstr "Dosya bulunamadı" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -1034,7 +1034,7 @@ msgid "" "available:\n" msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" @@ -1358,108 +1358,108 @@ msgstr "Paketler doğrulanmadan kurulsun mu?" msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ama kurulu değil" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ya da" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1467,27 +1467,27 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" @@ -1496,7 +1496,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[E/h]" @@ -1504,21 +1504,21 @@ msgstr "[E/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[e/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "H" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" @@ -1692,7 +1692,7 @@ msgstr "Yansı dosyası %s okunamıyor" msgid "[Mirror: %s]" msgstr "[Yansı: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Altsürece IPC borusu oluşturulamadı" @@ -2051,47 +2051,47 @@ msgstr "Hatalı geçersiz kılma %s satır %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Hatalı geçersiz kılma %s satır %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Bilinmeyen sıkıştırma algoritması '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır." -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "DOSYA* oluşturulamadı" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork yapılamadı" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Çocuğu sıkıştır" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "İç hata, %s oluşturulamadı" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 hesaplanırken okunamadı" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s bağı koparılırken sorun çıktı" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s, %s olarak yeniden adlandırılamadı" @@ -2227,12 +2227,12 @@ msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "%s/%s yapılandırma dosyası zaten mevcut" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s dosyasına yazılamadı" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s dosyası kapatılamadı" @@ -2620,22 +2620,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:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "%s dosyası kapatılamadı" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s dosyası %s olarak yeniden adlandırılamadı" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "%s dosyasından bağ kaldırma sorunu" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Dosya eşitlenirken sorun çıktı" @@ -2905,7 +2905,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Liste dizini %spartial bulunamadı." @@ -3079,7 +3079,7 @@ msgstr "Boyutlar eşleşmiyor" msgid "Invalid file format" msgstr "Geçersiz işlem: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3088,17 +3088,17 @@ msgstr "" "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " "dosyasındaki girdi ya da satır hatalı)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3107,12 +3107,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3122,12 +3122,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3136,12 +3136,12 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3177,50 +3177,41 @@ msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi" msgid "Vendor block %s contains no fingerprint" msgstr "Sağlayıcı bloğu %s parmak izi içermiyor" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"CD-ROM bağlama noktası %s kullanılıyor\n" -"CD-ROM bağlanıyor\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Tanımlanıyor... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Kayıtlı etiket: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM ayrılıyor...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM bağlama noktası %s kullanılıyor\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM ayrılıyor\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Disk bekleniliyor...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM bağlanıyor...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Tanımlanıyor... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Kayıtlı etiket: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM ayrılıyor...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Disk, indeks dosyaları için taranıyor..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3229,7 +3220,7 @@ msgstr "" "%zu paket indeksi, %zu kaynak indeksi, %zu çeviri indeksi ve %zu imza " "bulundu\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3237,16 +3228,16 @@ msgstr "" "Hiç paket dosyası bulunamadı. Belirttiğiniz disk bir Debian diski değil ya " "da yanlış mimariye sahip." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "'%s' etiketi bulundu\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Bu, geçerli bir ad değil, yeniden deneyin.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3255,15 +3246,15 @@ msgstr "" "Disk adı: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Paket listeleri kopyalanıyor.." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Yeni kaynak listesi yazılıyor\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Bu disk için olan kaynak listesi girdileri:\n" @@ -3560,6 +3551,13 @@ msgstr "" msgid "Not locked" msgstr "Kilitlenmemiş" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "CD-ROM bağlama noktası %s kullanılıyor\n" +#~ "CD-ROM bağlanıyor\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/uk.po b/po/uk.po index 7f7f094c3..c089d5fac 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -164,7 +164,7 @@ msgstr " Фіксатор(pin) пакунка: " msgid " Version table:" msgstr " Таблиця версій:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -258,12 +258,12 @@ msgstr "Задайте назву для цього Диска, наприкла msgid "Please insert a Disc in the drive and press enter" msgstr "Будь-ласка, вставте Диск у пристрій і натисніть Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не вдалося під'єднати '%s' до '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторіть цей процес для решти CD з вашого набору." @@ -781,13 +781,13 @@ msgstr "Диск не знайдено." msgid "File not found" msgstr "Файл не знайдено" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -1050,7 +1050,7 @@ msgstr "" "Наступні підписи не можуть бути перевірені, тому що публічний ключ " "відсутній:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Пусті файли не можуть бути правильними архівами" @@ -1379,108 +1379,108 @@ msgstr "Встановити ці пакунки без перевірки?" msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "але він не встановлений" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " чи" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1488,27 +1488,27 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" @@ -1517,7 +1517,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1525,21 +1525,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -1713,7 +1713,7 @@ msgstr "Неможливо прочитати файл дзеркала '%s'" msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC канал для підпроцесу" @@ -2079,47 +2079,47 @@ msgstr "Спотворений запис про перепризначення msgid "Malformed override %s line %llu #3" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Невідомий алгоритм стиснення '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Не вдалося створити FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Не вдалося породити процес (fork)" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Процес-нащадок, що виконує пакування" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутрішня помилка, не вдалося створити %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Помилка уведення/виводу в підпроцес/файл" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Помилка зчитування під час обчислення MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не вдалося перейменувати %s на %s" @@ -2258,12 +2258,12 @@ msgstr "Подвійне додавання diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Копія конфігураційного файлу %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Не вдалося записати файл %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Не вдалося закрити файл %s" @@ -2655,22 +2655,22 @@ msgstr "зчитування, повинен зчитати ще %llu байт, msgid "write, still have %llu to write but couldn't" msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Проблема з закриттям файла %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема з роз'єднанням файла %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2929,7 +2929,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Відсутня директорія зі списками: %spartial" @@ -3102,7 +3102,7 @@ msgstr "Невідповідність розміру" msgid "Invalid file format" msgstr "Невірна дія %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3111,16 +3111,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3129,12 +3129,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3144,12 +3144,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3158,12 +3158,12 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3200,50 +3200,41 @@ msgstr "Невірний запис 'Date' у 'Release' файлі %s" msgid "Vendor block %s contains no fingerprint" msgstr "Блок постачальника %s не містить відбитку (fingerprint)" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Використовується точка монтування CD-ROM: %s\n" -"Монтується CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Ідентифікація.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Записано мітку: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Демонтується CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Використовується точка монтування CD-ROM: %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Демонтується CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Чекаю на диск...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Монтується CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Ідентифікація.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Записано мітку: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтується CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Сканується диск на вміст індексних файлів..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3252,7 +3243,7 @@ msgstr "" "Знайдено %zu індексів пакунків, %zu індексів вихідних текстів, %zu індексів " "перекладів і %zu підписів\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3260,16 +3251,16 @@ msgstr "" "Неможливо знайти ніякі файли пакунків, можливо, що це не диск з Debian, або " "невірна архітектура?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Знайдено мітку: '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Не є вірною назвою, спробуйте ще.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3278,15 +3269,15 @@ msgstr "" "Цей диск зветься: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Копіюються переліки пакунків..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Записується новий перелік вихідних текстів\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Перелік вихідних текстів для цього диска:\n" @@ -3597,6 +3588,13 @@ msgstr "" msgid "Not locked" msgstr "Не заблоковано" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Використовується точка монтування CD-ROM: %s\n" +#~ "Монтується CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/vi.po b/po/vi.po index 78bc3cda5..a4941fe3f 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-10 07:15+0700\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -161,7 +161,7 @@ msgstr " Ghim gói: " msgid " Version table:" msgstr " Bảng phiên bản:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -263,12 +263,12 @@ msgstr "Hãy cung cấp tên cho Đĩa này, kiểu như là: “Debian 5.0.3 Đ msgid "Please insert a Disc in the drive and press enter" msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Gặp lỗi khi gắn “%s” vào “%s”" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn." @@ -811,12 +811,12 @@ msgstr "Không tìm thấy đĩa." msgid "File not found" msgstr "Không tìm thấy tập tin" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -1079,7 +1079,7 @@ msgid "" msgstr "" "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ" @@ -1397,105 +1397,105 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?" msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy về %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "không hiểu" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, c-format msgid "[installed,upgradable to: %s]" msgstr "[đã cài, có thể nâng cấp thành: %s]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 msgid "[installed,local]" msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "[đã cài,có thể tự động gỡ bỏ]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 msgid "[installed,automatic]" msgstr "[đã cài đặt,tự động]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 msgid "[installed]" msgstr "[đã cài đặt]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "[có thể nâng cấp từ: %s]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "[residual-config]" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "nhưng mà nó không được cài đặt" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " hay" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Những gói sau sẽ bị GỠ BỎ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Những gói sau đây được giữ lại:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Những gói sau đây sẽ được NÂNG CẤP:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Những gói sau đây sẽ bị HẠ CẤP:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1503,27 +1503,27 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nâng cấp, %lu được cài đặt mới, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu bị hạ cấp, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" @@ -1532,7 +1532,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[C/k]" @@ -1540,21 +1540,21 @@ msgstr "[C/k]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[c/K]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "C" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "K" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" @@ -1724,7 +1724,7 @@ msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”" msgid "[Mirror: %s]" msgstr "[Bản sao: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" @@ -1768,1845 +1768,1843 @@ msgstr "" msgid "Merging available information" msgstr "Đang hòa trộn các thông tin sẵn có..." -#: apt-inst/contrib/extracttar.cc:116 -msgid "Failed to create pipes" -msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" - -#: apt-inst/contrib/extracttar.cc:143 -msgid "Failed to exec gzip " -msgstr "Việc thực hiện gzip bị lỗi " - -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 -msgid "Corrupted archive" -msgstr "Kho bị hỏng." - -#: apt-inst/contrib/extracttar.cc:195 -msgid "Tar checksum failed, archive corrupted" -msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" - -#: apt-inst/contrib/extracttar.cc:300 +#: cmdline/apt-extracttemplates.cc:100 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" - -#: apt-inst/contrib/arfile.cc:74 -msgid "Invalid archive signature" -msgstr "Chữ ký kho không hợp lệ" +msgid "%s not a valid DEB package." +msgstr "%s không phải là một gói DEB hợp lệ." -#: apt-inst/contrib/arfile.cc:82 -msgid "Error reading archive member header" -msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" +#: cmdline/apt-extracttemplates.cc:234 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" +"\n" +"[extract: rút trích;\n" +"templates: mẫu]\n" +"\n" +"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" +"\tvà biểu mẫu đều từ gói Debian\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này\n" +" -t Đặt thư mục tạm thời\n" +" [t: viết tắt cho từ “temporary”: tạm thời]\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-inst/contrib/arfile.cc:94 +#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 #, c-format -msgid "Invalid archive member header %s" -msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" +msgid "Unable to write to %s" +msgstr "Không thể ghi vào %s" -#: apt-inst/contrib/arfile.cc:106 -msgid "Invalid archive member header" -msgstr "Phần đầu thành viên kho không hợp lê" +#: cmdline/apt-extracttemplates.cc:308 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: apt-inst/contrib/arfile.cc:135 -msgid "Archive is too short" -msgstr "Kho quá ngắn" +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +msgid "Package extension list is too long" +msgstr "Danh sách mở rộng gói quá dài" -#: apt-inst/contrib/arfile.cc:139 -msgid "Failed to read the archive headers" -msgstr "Việc đọc phần đầu kho bị lỗi" +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#, c-format +msgid "Error processing directory %s" +msgstr "Gặp lỗi khi xử lý thư mục %s" -#: apt-inst/filelist.cc:382 -msgid "DropNode called on still linked node" -msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" +#: ftparchive/apt-ftparchive.cc:262 +msgid "Source extension list is too long" +msgstr "Danh sách mở rộng nguồn quá dài" -#: apt-inst/filelist.cc:414 -msgid "Failed to locate the hash element!" -msgstr "Gặp lỗi xác định vị trí phần tử băm!" +#: ftparchive/apt-ftparchive.cc:379 +msgid "Error writing header to contents file" +msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: apt-inst/filelist.cc:461 -msgid "Failed to allocate diversion" -msgstr "Gặp lỗi khi xác định vị trí trệch đi" +#: ftparchive/apt-ftparchive.cc:409 +#, c-format +msgid "Error processing contents %s" +msgstr "Gặp lỗi khi xử lý nội dung %s" -#: apt-inst/filelist.cc:466 -msgid "Internal error in AddDiversion" -msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" +#: ftparchive/apt-ftparchive.cc:597 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" +"\n" +"[ftparchive: FTP archive: kho FTP]\n" +"\n" +"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" +" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" +" contents path\n" +" release path\n" +" generate config [các_nhóm]\n" +" clean config\n" +"\n" +"(packages: những gói;\n" +"binarypath: đường dẫn nhị phân;\n" +"sources: những nguồn;\n" +"srcpath: đường dẫn nguồn;\n" +"contents path: đường dẫn nội dung;\n" +"release path: đường dẫn bản đã phát hành;\n" +"generate config [groups]: tạo ra cấu hình [các nhóm];\n" +"clean config: cấu hình toàn mới)\n" +"\n" +"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" +"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" +"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" +"và dpkg-scansources (dpkg-quét_nguồn).\n" +"\n" +"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" +"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" +"cùng với băm MD5 và kích cỡ tập tin.\n" +"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" +"\n" +"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" +"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" +"để ghi rõ tập tin đè nguồn\n" +"\n" +"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" +"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " +"quy,\n" +"và tập tin đè nên chứa những cờ đè.\n" +"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" +"những trường tên tập tin nếu có.\n" +"Cách sử dụng thí dụ từ kho Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Tùy chọn:\n" +" -h _Trợ giúp_ này\n" +" --md5 Điều khiển cách tạo ra MD5\n" +" -s=? Tập tin đè nguồn\n" +" -q _Im lặng_ (không xuất chi tiết)\n" +" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" +" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" +" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" -#: apt-inst/filelist.cc:479 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" +#: ftparchive/apt-ftparchive.cc:803 +msgid "No selections matched" +msgstr "Không có cái được chọn khớp được" -#: apt-inst/filelist.cc:508 +#: ftparchive/apt-ftparchive.cc:881 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Sự trệch đi được thêm hai lần %s → %s" +msgid "Some files are missing in the package file group `%s'" +msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." -#: apt-inst/filelist.cc:551 +#: ftparchive/cachedb.cc:47 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Failed to write file %s" -msgstr "Việc ghi tập tin %s gặp lỗi" +msgid "DB is old, attempting to upgrade %s" +msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Việc đóng tập tin %s gặp lỗi" +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " +"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: ftparchive/cachedb.cc:81 #, c-format -msgid "The path %s is too long" -msgstr "Đường dẫn %s quá dài" +msgid "Unable to open DB file %s: %s" +msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: apt-inst/extract.cc:125 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format -msgid "Unpacking %s more than once" -msgstr "Đang giải nén %s nhiều lần" +msgid "Failed to stat %s" +msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" -#: apt-inst/extract.cc:135 -#, c-format -msgid "The directory %s is diverted" -msgstr "Thư mục %s bị trệch hướng" +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "Kho không có mục ghi điều khiển" -#: apt-inst/extract.cc:145 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" - -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 -msgid "The diversion path is too long" -msgstr "Đường dẫn trệch đi quá dài" +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "Không thể lấy con trỏ" -#: apt-inst/extract.cc:179 apt-inst/extract.cc:192 apt-inst/extract.cc:209 -#: ftparchive/cachedb.cc:127 +#: ftparchive/writer.cc:82 #, c-format -msgid "Failed to stat %s" -msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" +msgid "W: Unable to read directory %s\n" +msgstr "CB: Không thể đọc thư mục %s\n" -#: apt-inst/extract.cc:187 ftparchive/multicompress.cc:371 +#: ftparchive/writer.cc:87 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Việc đổi tên %s thành %s bị lỗi" +msgid "W: Unable to stat %s\n" +msgstr "CB: Không thể lấy thông tin thống kê %s\n" -#: apt-inst/extract.cc:242 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" +#: ftparchive/writer.cc:143 +msgid "E: " +msgstr "L: " -#: apt-inst/extract.cc:282 -msgid "Failed to locate node in its hash bucket" -msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" +#: ftparchive/writer.cc:145 +msgid "W: " +msgstr "CB: " -#: apt-inst/extract.cc:286 -msgid "The path is too long" -msgstr "Đường dẫn quá dài" +#: ftparchive/writer.cc:152 +msgid "E: Errors apply to file " +msgstr "LỖI: có lỗi áp dụng vào tập tin " -#: apt-inst/extract.cc:414 +#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" +msgid "Failed to resolve %s" +msgstr "Gặp lỗi khi phân giải %s" -#: apt-inst/extract.cc:431 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" +#: ftparchive/writer.cc:183 +msgid "Tree walking failed" +msgstr "Việc di chuyển qua cây bị lỗi" -#: apt-inst/extract.cc:491 +#: ftparchive/writer.cc:210 #, c-format -msgid "Unable to stat %s" -msgstr "Không thể lấy thông tin thống kê %s" +msgid "Failed to open %s" +msgstr "Gặp lỗi khi mở %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: ftparchive/writer.cc:269 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" +msgid " DeLink %s [%s]\n" +msgstr " Bỏ liên kết %s [%s]\n" -#: apt-inst/deb/debfile.cc:119 +#: ftparchive/writer.cc:277 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" - -#: apt-inst/deb/debfile.cc:213 -msgid "Unparsable control file" -msgstr "Tập tin điều khiển không có khả năng phân tách" - -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" +msgid "Failed to readlink %s" +msgstr "Gặp lỗi khi đọc liên kết %s" -#: apt-pkg/contrib/mmap.cc:111 +#: ftparchive/writer.cc:281 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Không thể nhân đôi bộ mô tả tập tin %i" +msgid "Failed to unlink %s" +msgstr "Việc bỏ liên kết %s bị lỗi" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/writer.cc:289 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" - -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" - -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" +msgid "*** Failed to link %s to %s" +msgstr "*** Gặp lỗi khi liên kết %s đến %s" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/writer.cc:299 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" +msgid " DeLink limit of %sB hit.\n" +msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Gặp lỗi khi cắt ngắn tập tin" +#: ftparchive/writer.cc:404 +msgid "Archive had no package field" +msgstr "Kho không có trường gói" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" -"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" -"Giá trị hiện thời là: %lu. (man 5 apt.conf)" +msgid " %s has no override entry\n" +msgstr " %s không có mục ghi đè (override)\n" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." - -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " -"dùng tắt đi." +msgid " %s maintainer is %s not %s\n" +msgstr " người bảo trì %s là %s không phải %s\n" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: ftparchive/writer.cc:712 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li ngày %li giờ %li phút %li giây" +msgid " %s has no source override entry\n" +msgstr " %s không có mục ghi đè (override) nguồn\n" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: ftparchive/writer.cc:716 #, c-format -msgid "%lih %limin %lis" -msgstr "%li giờ %li phút %li giây" +msgid " %s has no binary override entry either\n" +msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 -#, c-format -msgid "%limin %lis" -msgstr "%li phút %li giây" +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format -msgid "%lis" -msgstr "%li giây" +msgid "Unable to open %s" +msgstr "Không thể mở %s" -#: apt-pkg/contrib/strutl.cc:1229 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Selection %s not found" -msgstr "Không tìm thấy vùng chọn %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Sai “override” %s dòng %llu (%s)" -#: apt-pkg/contrib/configuration.cc:503 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Không chấp nhận kiểu viết tắt: “%c”" +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" -#: apt-pkg/contrib/configuration.cc:617 +#: ftparchive/override.cc:163 #, c-format -msgid "Opening configuration file %s" -msgstr "Đang mở tập tin cấu hình %s..." +msgid "Malformed override %s line %llu #1" +msgstr "Sai override %s dòng %llu #1" -#: apt-pkg/contrib/configuration.cc:785 +#: ftparchive/override.cc:175 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." +msgid "Malformed override %s line %llu #2" +msgstr "Sai override %s dòng %llu #2" -#: apt-pkg/contrib/configuration.cc:804 +#: ftparchive/override.cc:188 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" +msgid "Malformed override %s line %llu #3" +msgstr "Sai override %s dòng %llu #3" -#: apt-pkg/contrib/configuration.cc:821 +#: ftparchive/multicompress.cc:71 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" +msgid "Unknown compression algorithm '%s'" +msgstr "Không biết thuật toán nén “%s”" -#: apt-pkg/contrib/configuration.cc:861 +#: ftparchive/multicompress.cc:101 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" +msgid "Compressed output %s needs a compression set" +msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#: apt-pkg/contrib/configuration.cc:868 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" +#: ftparchive/multicompress.cc:190 +msgid "Failed to create FILE*" +msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" +#: ftparchive/multicompress.cc:193 +msgid "Failed to fork" +msgstr "Gặp lỗi khi rẽ nhánh tiến trình" -#: apt-pkg/contrib/configuration.cc:881 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" +#: ftparchive/multicompress.cc:207 +msgid "Compress child" +msgstr "Nén con" -#: apt-pkg/contrib/configuration.cc:884 +#: ftparchive/multicompress.cc:230 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" -"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " -"số" +msgid "Internal error, failed to create %s" +msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: apt-pkg/contrib/configuration.cc:934 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" +#: ftparchive/multicompress.cc:303 +msgid "IO to subprocess/file failed" +msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#: apt-pkg/contrib/progress.cc:146 +#: ftparchive/multicompress.cc:341 +msgid "Failed to read while computing MD5" +msgstr "Gặp lỗi khi đọc trong khi tính MD5" + +#: ftparchive/multicompress.cc:357 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Lỗi!" +msgid "Problem unlinking %s" +msgstr "Gặp lỗi khi bỏ liên kết %s" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Xong" +msgid "Failed to rename %s to %s" +msgstr "Việc đổi tên %s thành %s bị lỗi" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "..." +#: cmdline/apt-internal-solver.cc:38 +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-internal-solver\n" +"\n" +"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" +"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" +"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này.\n" +" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Không hiểu bản ghi gói!" -#: apt-pkg/contrib/cmndline.cc:116 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." +#: cmdline/apt-sortpkgs.cc:153 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" +"\n" +"[sortpkgs: sort packages: sắp xếp các gói]\n" +"\n" +"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" +"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp_ này\n" +" -s Sắp xếp những tập tin _nguồn_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Không hiểu tùy chọn dòng lệnh %s" +#: apt-inst/contrib/extracttar.cc:116 +msgid "Failed to create pipes" +msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "Việc thực hiện gzip bị lỗi " -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 -#, c-format -msgid "Option %s requires an argument." -msgstr "Tùy chọn %s yêu cầu một đối số." +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +msgid "Corrupted archive" +msgstr "Kho bị hỏng." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 -#, c-format -msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”." +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-inst/contrib/extracttar.cc:300 #, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" +msgid "Unknown TAR header type %u, member %s" +msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" -#: apt-pkg/contrib/cmndline.cc:304 -#, c-format -msgid "Option '%s' is too long" -msgstr "Tùy chọn “%s” quá dài" +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "Chữ ký kho không hợp lệ" -#: apt-pkg/contrib/cmndline.cc:336 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-inst/contrib/arfile.cc:94 #, c-format -msgid "Invalid operation %s" -msgstr "Thao tác “%s” không hợp lệ" +msgid "Invalid archive member header %s" +msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" -#: apt-pkg/contrib/cdromutl.cc:56 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "Phần đầu thành viên kho không hợp lê" -#: apt-pkg/contrib/cdromutl.cc:225 -msgid "Failed to stat the cdrom" -msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" +#: apt-inst/contrib/arfile.cc:135 +msgid "Archive is too short" +msgstr "Kho quá ngắn" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gặp vấn đề khi đóng tập tin gzip %s" +#: apt-inst/contrib/arfile.cc:139 +msgid "Failed to read the archive headers" +msgstr "Việc đọc phần đầu kho bị lỗi" -#: apt-pkg/contrib/fileutl.cc:228 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" -#: apt-pkg/contrib/fileutl.cc:233 -#, c-format -msgid "Could not open lock file %s" -msgstr "Không thể mở tập tin khóa %s" +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "Gặp lỗi xác định vị trí phần tử băm!" -#: apt-pkg/contrib/fileutl.cc:256 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "Gặp lỗi khi xác định vị trí trệch đi" -#: apt-pkg/contrib/fileutl.cc:261 -#, c-format -msgid "Could not get lock %s" -msgstr "Không thể lấy khóa %s" +#: apt-inst/filelist.cc:466 +msgid "Internal error in AddDiversion" +msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-inst/filelist.cc:479 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" -"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-inst/filelist.cc:508 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" +msgid "Double add of diversion %s -> %s" +msgstr "Sự trệch đi được thêm hai lần %s → %s" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-inst/filelist.cc:551 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" +msgid "Duplicate conf file %s/%s" +msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " -"lệ" +msgid "Failed to write file %s" +msgstr "Việc ghi tập tin %s gặp lỗi" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-inst/dirstream.cc:106 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." +msgid "Failed to close file %s" +msgstr "Việc đóng tập tin %s gặp lỗi" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Tiến trình con %s đã nhận tín hiệu %u." +msgid "The path %s is too long" +msgstr "Đường dẫn %s quá dài" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-inst/extract.cc:125 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" +msgid "Unpacking %s more than once" +msgstr "Đang giải nén %s nhiều lần" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-inst/extract.cc:135 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Tiến trình con %s đã thoát bất thường" +msgid "The directory %s is diverted" +msgstr "Thư mục %s bị trệch hướng" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-inst/extract.cc:145 #, c-format -msgid "Could not open file %s" -msgstr "Không thể mở tập tin %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +msgid "The diversion path is too long" +msgstr "Đường dẫn trệch đi quá dài" + +#: apt-inst/extract.cc:242 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Không thể mở bộ mô tả tập tin %d" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" -#: apt-pkg/contrib/fileutl.cc:1178 -msgid "Failed to create subprocess IPC" -msgstr "Việc tạo tiến trình con IPC bị lỗi" +#: apt-inst/extract.cc:282 +msgid "Failed to locate node in its hash bucket" +msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" -#: apt-pkg/contrib/fileutl.cc:1233 -msgid "Failed to exec compressor " -msgstr "Gặp lỗi khi thực hiện nén " +#: apt-inst/extract.cc:286 +msgid "The path is too long" +msgstr "Đường dẫn quá dài" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-inst/extract.cc:414 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" +msgid "Overwrite package match with no version for %s" +msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-inst/extract.cc:431 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "ghi, còn cần ghi %llu nhưng mà không thể" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-inst/extract.cc:491 #, c-format -msgid "Problem closing the file %s" -msgstr "Gặp vấn đề khi đóng tập tin %s" - -#: apt-pkg/contrib/fileutl.cc:1738 -#, 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" +msgid "Unable to stat %s" +msgstr "Không thể lấy thông tin thống kê %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#: apt-inst/deb/debfile.cc:54 #, 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:1762 -msgid "Problem syncing the file" -msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-inst/deb/debfile.cc:119 #, c-format -msgid "No keyring installed in %s." -msgstr "Không có vòng khoá nào được cài đặt vào %s." - -#: apt-pkg/pkgcache.cc:148 -msgid "Empty package cache" -msgstr "Bộ nhớ tạm gói trống" - -#: apt-pkg/pkgcache.cc:154 -msgid "The package cache file is corrupted" -msgstr "Tập tin nhớ tạm gói bị hỏng" +msgid "Internal error, could not locate member %s" +msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" -#: apt-pkg/pkgcache.cc:159 -msgid "The package cache file is an incompatible version" -msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" +#: apt-inst/deb/debfile.cc:213 +msgid "Unparsable control file" +msgstr "Tập tin điều khiển không có khả năng phân tách" -#: apt-pkg/pkgcache.cc:162 -msgid "The package cache file is corrupted, it is too small" -msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" - -#: apt-pkg/pkgcache.cc:172 -msgid "The package cache was built for a different architecture" -msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" - -#: apt-pkg/pkgcache.cc:314 -msgid "Depends" -msgstr "Phụ thuộc" - -#: apt-pkg/pkgcache.cc:314 -msgid "PreDepends" -msgstr "Phụ thuộc sẵn" - -#: apt-pkg/pkgcache.cc:314 -msgid "Suggests" -msgstr "Đề nghị" - -#: apt-pkg/pkgcache.cc:315 -msgid "Recommends" -msgstr "Khuyến khích" - -#: apt-pkg/pkgcache.cc:315 -msgid "Conflicts" -msgstr "Xung đột" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Không thể nhân đôi bộ mô tả tập tin %i" -#: apt-pkg/pkgcache.cc:315 -msgid "Replaces" -msgstr "Thay thế" +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" -#: apt-pkg/pkgcache.cc:316 -msgid "Obsoletes" -msgstr "Cũ" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" -#: apt-pkg/pkgcache.cc:316 -msgid "Breaks" -msgstr "Làm hỏng" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" -#: apt-pkg/pkgcache.cc:316 -msgid "Enhances" -msgstr "Tăng cường" +#: apt-pkg/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/pkgcache.cc:327 -msgid "important" -msgstr "quan trọng" +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Gặp lỗi khi cắt ngắn tập tin" -#: apt-pkg/pkgcache.cc:327 -msgid "required" -msgstr "yêu cầu" +#: apt-pkg/contrib/mmap.cc:341 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" +"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" +"Giá trị hiện thời là: %lu. (man 5 apt.conf)" -#: apt-pkg/pkgcache.cc:327 -msgid "standard" -msgstr "chuẩn" +#: apt-pkg/contrib/mmap.cc:446 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." -#: apt-pkg/pkgcache.cc:328 -msgid "optional" -msgstr "tùy chọn" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " +"dùng tắt đi." -#: apt-pkg/pkgcache.cc:328 -msgid "extra" -msgstr "bổ sung" +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:401 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%li ngày %li giờ %li phút %li giây" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 -msgid "Building dependency tree" -msgstr "Đang xây dựng cây quan hệ phụ thuộc" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:408 +#, c-format +msgid "%lih %limin %lis" +msgstr "%li giờ %li phút %li giây" -#: apt-pkg/depcache.cc:133 -msgid "Candidate versions" -msgstr "Phiên bản ứng cử" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:415 +#, c-format +msgid "%limin %lis" +msgstr "%li phút %li giây" -#: apt-pkg/depcache.cc:162 -msgid "Dependency generation" -msgstr "Tạo ra quan hệ phụ thuộc" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:420 +#, c-format +msgid "%lis" +msgstr "%li giây" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 -msgid "Reading state information" -msgstr "Đang đọc thông tin về tình trạng" +#: apt-pkg/contrib/strutl.cc:1229 +#, c-format +msgid "Selection %s not found" +msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/contrib/configuration.cc:503 #, c-format -msgid "Failed to open StateFile %s" -msgstr "Lỗi mở tập tin tình trạng StateFile %s" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Không chấp nhận kiểu viết tắt: “%c”" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/contrib/configuration.cc:617 #, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" +msgid "Opening configuration file %s" +msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/contrib/configuration.cc:785 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Không thể phân tích tập tin gói %s (1)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/contrib/configuration.cc:804 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Không thể phân tích tập tin gói %s (2)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/contrib/configuration.cc:821 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/contrib/configuration.cc:861 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " -"tích được)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/contrib/configuration.cc:868 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " -"gán)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/contrib/configuration.cc:881 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " -"trị)" +"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " +"số" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/contrib/configuration.cc:934 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/contrib/progress.cc:146 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" +msgid "%c%s... Error!" +msgstr "%c%s... Lỗi!" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" +msgid "%c%s... Done" +msgstr "%c%s... Xong" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "..." + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/contrib/cmndline.cc:116 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 +#: apt-pkg/contrib/cmndline.cc:158 #, c-format -msgid "Opening %s" -msgstr "Đang mở %s" +msgid "Command line option %s is not understood" +msgstr "Không hiểu tùy chọn dòng lệnh %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format -msgid "Line %u too long in source list %s." -msgstr "Dòng %u quá dài trong danh sách nguồn %s." +msgid "Command line option %s is not boolean" +msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." +msgid "Option %s requires an argument." +msgstr "Tùy chọn %s yêu cầu một đối số." -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." +msgid "Option %s: Configuration item specification must have an =<val>." +msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”." -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/contrib/cmndline.cc:273 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/contrib/cmndline.cc:304 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." -"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" +msgid "Option '%s' is too long" +msgstr "Tùy chọn “%s” quá dài" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/contrib/cmndline.cc:336 #, c-format -msgid "Could not configure '%s'. " -msgstr "Không thể cấu hình “%s”. " +msgid "Sense %s is not understood, try true or false." +msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/contrib/cmndline.cc:386 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " -"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " -"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" -"LoopBreak” (buộc ngắt vòng lặp)." +msgid "Invalid operation %s" +msgstr "Thao tác “%s” không hợp lệ" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/contrib/cdromutl.cc:56 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" +msgid "Unable to stat the mount point %s" +msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/contrib/cdromutl.cc:225 +msgid "Failed to stat the cdrom" +msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" + +#: apt-pkg/contrib/fileutl.cc:95 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." +msgid "Problem closing the gzip file %s" +msgstr "Gặp vấn đề khi đóng tập tin gzip %s" -#: apt-pkg/algorithms.cc:1068 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " -"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." +#: apt-pkg/contrib/fileutl.cc:228 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/algorithms.cc:1070 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." +#: apt-pkg/contrib/fileutl.cc:233 +#, c-format +msgid "Could not open lock file %s" +msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/contrib/fileutl.cc:256 #, c-format -msgid "List directory %spartial is missing." -msgstr "Thiếu thư mục danh sách %spartial." +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/contrib/fileutl.cc:261 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Thiếu thư mục kho lưu %spartial." +msgid "Could not get lock %s" +msgstr "Không thể lấy khóa %s" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 #, c-format -msgid "Unable to lock directory %s" -msgstr "Không thể khoá thư mục %s" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/contrib/fileutl.cc:432 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/contrib/fileutl.cc:450 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Đang tải tập tin %li trong tổng số %li" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/contrib/fileutl.cc:459 #, 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." +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " +"lệ" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/contrib/fileutl.cc:862 #, c-format -msgid "Method %s did not start correctly" -msgstr "Phương thức %s đã không khởi chạy đúng đắn." +msgid "Sub-process %s received a segmentation fault." +msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/contrib/fileutl.cc:864 #, 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." +msgid "Sub-process %s received signal %u." +msgstr "Tiến trình con %s đã nhận tín hiệu %u." -#: apt-pkg/init.cc:143 +#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Không hỗ trợ hệ thống đóng gói “%s”" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" -#: apt-pkg/init.cc:159 -msgid "Unable to determine a suitable packaging system type" -msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" +#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Tiến trình con %s đã thoát bất thường" -#: apt-pkg/clean.cc:57 +#: apt-pkg/contrib/fileutl.cc:1016 #, c-format -msgid "Unable to stat %s." -msgstr "Không thể lấy trạng thái về %s." +msgid "Could not open file %s" +msgstr "Không thể mở tập tin %s" -#: apt-pkg/srcrecords.cc:47 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" +#: apt-pkg/contrib/fileutl.cc:1093 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-pkg/cachefile.cc:87 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." +#: apt-pkg/contrib/fileutl.cc:1178 +msgid "Failed to create subprocess IPC" +msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/cachefile.cc:91 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " -"này" +#: apt-pkg/contrib/fileutl.cc:1233 +msgid "Failed to exec compressor " +msgstr "Gặp lỗi khi thực hiện nén " -#: apt-pkg/cachefile.cc:109 -msgid "The list of sources could not be read." -msgstr "Không thể đọc danh sách nguồn." +#: apt-pkg/contrib/fileutl.cc:1326 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/policy.cc:75 +#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" -"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " -"không sẵn có trong mã nguồn" +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/policy.cc:414 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" -"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." +msgid "Problem closing the file %s" +msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/policy.cc:436 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format -msgid "Did not understand pin type %s" -msgstr "Không hiểu kiểu ghim %s" +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/policy.cc:444 -msgid "No priority (or zero) specified for pin" -msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" +#: apt-pkg/contrib/fileutl.cc:1755 +#, 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/pkgcachegen.cc:87 -msgid "Cache has an incompatible versioning system" -msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" +#: apt-pkg/contrib/fileutl.cc:1768 +msgid "Problem syncing the file" +msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:70 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" +msgid "No keyring installed in %s." +msgstr "Không có vòng khoá nào được cài đặt vào %s." -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:148 +msgid "Empty package cache" +msgstr "Bộ nhớ tạm gói trống" -#: apt-pkg/pkgcachegen.cc:254 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:154 +msgid "The package cache file is corrupted" +msgstr "Tập tin nhớ tạm gói bị hỏng" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:159 +msgid "The package cache file is an incompatible version" +msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:162 +msgid "The package cache file is corrupted, it is too small" +msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcache.cc:167 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" +msgid "This APT does not support the versioning system '%s'" +msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" -#: apt-pkg/pkgcachegen.cc:1199 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" +#: apt-pkg/pkgcache.cc:172 +msgid "The package cache was built for a different architecture" +msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 -msgid "Reading package lists" -msgstr "Đang đọc các danh sách gói" +#: apt-pkg/pkgcache.cc:314 +msgid "Depends" +msgstr "Phụ thuộc" -#: apt-pkg/pkgcachegen.cc:1304 -msgid "Collecting File Provides" -msgstr "Đang tập hợp các Nhà cung cấp Tập tin" +#: apt-pkg/pkgcache.cc:314 +msgid "PreDepends" +msgstr "Phụ thuộc sẵn" -#: apt-pkg/pkgcachegen.cc:1388 cmdline/apt-extracttemplates.cc:266 -#, c-format -msgid "Unable to write to %s" -msgstr "Không thể ghi vào %s" +#: apt-pkg/pkgcache.cc:314 +msgid "Suggests" +msgstr "Đề nghị" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 -msgid "IO Error saving source cache" -msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" +#: apt-pkg/pkgcache.cc:315 +msgid "Recommends" +msgstr "Khuyến khích" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." +#: apt-pkg/pkgcache.cc:315 +msgid "Conflicts" +msgstr "Xung đột" -#: apt-pkg/acquire-item.cc:154 -msgid "Hash Sum mismatch" -msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" +#: apt-pkg/pkgcache.cc:315 +msgid "Replaces" +msgstr "Thay thế" -#: apt-pkg/acquire-item.cc:159 -msgid "Size mismatch" -msgstr "Kích cỡ không khớp nhau" +#: apt-pkg/pkgcache.cc:316 +msgid "Obsoletes" +msgstr "Cũ" -#: apt-pkg/acquire-item.cc:164 -msgid "Invalid file format" -msgstr "Định dạng tập tập tin không hợp lệ" +#: apt-pkg/pkgcache.cc:316 +msgid "Breaks" +msgstr "Làm hỏng" + +#: apt-pkg/pkgcache.cc:316 +msgid "Enhances" +msgstr "Tăng cường" + +#: apt-pkg/pkgcache.cc:327 +msgid "important" +msgstr "quan trọng" + +#: apt-pkg/pkgcache.cc:327 +msgid "required" +msgstr "yêu cầu" + +#: apt-pkg/pkgcache.cc:327 +msgid "standard" +msgstr "chuẩn" + +#: apt-pkg/pkgcache.cc:328 +msgid "optional" +msgstr "tùy chọn" + +#: apt-pkg/pkgcache.cc:328 +msgid "extra" +msgstr "bổ sung" + +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +msgid "Building dependency tree" +msgstr "Đang xây dựng cây quan hệ phụ thuộc" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/depcache.cc:133 +msgid "Candidate versions" +msgstr "Phiên bản ứng cử" + +#: apt-pkg/depcache.cc:162 +msgid "Dependency generation" +msgstr "Tạo ra quan hệ phụ thuộc" + +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +msgid "Reading state information" +msgstr "Đang đọc thông tin về tình trạng" + +#: apt-pkg/depcache.cc:244 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " -"sources.list hoặc tập tin bị hỏng)" +msgid "Failed to open StateFile %s" +msgstr "Lỗi mở tập tin tình trạng StateFile %s" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/depcache.cc:250 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" +msgid "Failed to write temporary StateFile %s" +msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" -#: apt-pkg/acquire-item.cc:1619 -msgid "There is no public key available for the following key IDs:\n" -msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" +#: apt-pkg/tagfile.cc:138 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Không thể phân tích tập tin gói %s (1)" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/tagfile.cc:235 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " -"này sẽ không được áp dụng." +msgid "Unable to parse package file %s (2)" +msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/sourcelist.cc:118 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/sourcelist.cc:161 #, c-format -msgid "" -"An error occurred during the signature verification. The repository is not " -"updated and the previous index files will be used. GPG error: %s: %s\n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -"Gặp lỗi trong khi thẩm tra chữ ký.\n" -"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" -"Lỗi GPG: %s: %s\n" +"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " +"tích được)" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/sourcelist.cc:164 #, c-format -msgid "GPG error: %s: %s" -msgstr "Lỗi GPG: %s: %s" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/sourcelist.cc:175 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " -"này, do thiếu kiến trúc." +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " +"gán)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/sourcelist.cc:181 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " -"tin:) cho gói %s." +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " +"trị)" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/sourcelist.cc:197 #, c-format -msgid "Unable to parse Release file %s" -msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/sourcelist.cc:199 #, c-format -msgid "No sections in Release file %s" -msgstr "Không có phần nào trong tập tin Phát hành %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/sourcelist.cc:202 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " -"hành %s" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/sourcelist.cc:215 #, c-format -msgid "Invalid 'Date' entry in Release file %s" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/sourcelist.cc:326 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Khối nhà bán %s không chứa vân tay" +msgid "Opening %s" +msgstr "Đang mở %s" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Đang dùng thư mục gắn đĩa CD-ROM %s\n" -"Đang gắn đĩa CD-ROM...\n" +msgid "Line %u too long in source list %s." +msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Đang nhận diện... " - -#: apt-pkg/cdrom.cc:613 +#: apt-pkg/sourcelist.cc:362 #, c-format -msgid "Stored label: %s\n" -msgstr "Nhãn đã lưu: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Đang bỏ gắn CD-ROM...\n" +msgid "Malformed line %u in source list %s (type)" +msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/sourcelist.cc:366 #, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" - -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" -msgstr "Đang bỏ gắn CD-ROM...\n" - -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" -msgstr "Đang đợi đĩa...\n" - -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "Đang gắn đĩa CD-ROM...\n" - -#: apt-pkg/cdrom.cc:693 -msgid "Scanning disc for index files..\n" -msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/sourcelist.cc:407 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" -msgstr "" -"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#, c-format msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " -"hoặc có kiến trúc không đúng?" +"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." +"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 #, c-format -msgid "Found label '%s'\n" -msgstr "Tìm thấy nhãn “%s”\n" - -#: apt-pkg/cdrom.cc:811 -msgid "That is not a valid name, try again.\n" -msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" +msgid "Could not configure '%s'. " +msgstr "Không thể cấu hình “%s”. " -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/packagemanager.cc:570 #, c-format msgid "" -"This disc is called: \n" -"'%s'\n" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Tên đĩa này:\n" -"“%s”\n" - -#: apt-pkg/cdrom.cc:830 -msgid "Copying package lists..." -msgstr "Đang sao chép các danh sách gói..." - -#: apt-pkg/cdrom.cc:865 -msgid "Writing new source list\n" -msgstr "Đang ghi danh sách nguồn mới\n" - -#: apt-pkg/cdrom.cc:873 -msgid "Source list entries for this disc are:\n" -msgstr "Các mục tin danh sách nguồn cho đĩa này:\n" - -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Đã ghi %i bản ghi.\n" +"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " +"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " +"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" +"LoopBreak” (buộc ngắt vòng lặp)." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/pkgrecords.cc:34 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" +msgid "Index file type '%s' is not supported" +msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/algorithms.cc:266 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +#: apt-pkg/algorithms.cc:1068 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." msgstr "" -"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " -"nhau\n" +"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " +"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/indexcopy.cc:515 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "Không tìm thấy bản ghi xác thực cho: %s" +#: apt-pkg/algorithms.cc:1070 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Sai khớp chuỗi duy nhất cho: %s" +msgid "List directory %spartial is missing." +msgstr "Thiếu thư mục danh sách %spartial." -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/acquire.cc:85 #, 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”" +msgid "Archives directory %spartial is missing." +msgstr "Thiếu thư mục kho lưu %spartial." -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/acquire.cc:93 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Không tìm thấy phiên bản “%s” cho “%s”" +msgid "Unable to lock directory %s" +msgstr "Không thể khoá thư mục %s" -#: apt-pkg/cacheset.cc:583 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:893 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Không tìm thấy tác vụ “%s”" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/acquire.cc:895 #, 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”" +msgid "Retrieving file %li of %li" +msgstr "Đang tải tập tin %li trong tổng số %li" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/acquire-worker.cc:112 #, 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" +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/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/acquire-worker.cc:161 #, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -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ó" +msgid "Method %s did not start correctly" +msgstr "Phương thức %s đã không khởi chạy đúng đắn." -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/acquire-worker.cc:447 #, 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" +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." -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/init.cc:143 #, 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ử" +msgid "Packaging system '%s' is not supported" +msgstr "Không hỗ trợ hệ thống đóng gói “%s”" -#: apt-pkg/cacheset.cc:637 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" -"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " -"đặt" +#: apt-pkg/init.cc:159 +msgid "Unable to determine a suitable packaging system type" +msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 -msgid "Send scenario to solver" -msgstr "Gửi kịch bản đến bộ phân giải" +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "Không thể lấy trạng thái về %s." -#: apt-pkg/edsp.cc:209 -msgid "Send request to solver" -msgstr "Gửi yêu cầu đến bộ phân giải" +#: apt-pkg/srcrecords.cc:47 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" +"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" -#: apt-pkg/edsp.cc:279 -msgid "Prepare for receiving solution" -msgstr "Chuẩn bị để lấy cách giải quyết" +#: apt-pkg/cachefile.cc:87 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." -#: apt-pkg/edsp.cc:286 -msgid "External solver failed without a proper error message" -msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" +#: apt-pkg/cachefile.cc:91 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " +"này" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 -msgid "Execute external solver" -msgstr "Thi hành bộ phân giải từ bên ngoài" +#: apt-pkg/cachefile.cc:109 +msgid "The list of sources could not be read." +msgstr "Không thể đọc danh sách nguồn." -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/policy.cc:75 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Diễn biến: [%3i%%]" - -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 -msgid "Running dpkg" -msgstr "Đang chạy dpkg" - -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " -"được dùng thay thế." - -#: apt-pkg/deb/dpkgpm.cc:91 -#, c-format -msgid "Installing %s" -msgstr "Đang cài đặt %s" +"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " +"không sẵn có trong mã nguồn" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/policy.cc:414 #, c-format -msgid "Configuring %s" -msgstr "Đang cấu hình %s" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/policy.cc:436 #, c-format -msgid "Removing %s" -msgstr "Đang gỡ bỏ %s" +msgid "Did not understand pin type %s" +msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/deb/dpkgpm.cc:94 -#, c-format -msgid "Completely removing %s" -msgstr "Đang gỡ bỏ hoàn toàn %s" +#: apt-pkg/policy.cc:444 +msgid "No priority (or zero) specified for pin" +msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Noting disappearance of %s" -msgstr "Đang ghi chép sự biến mất của %s" - -#: apt-pkg/deb/dpkgpm.cc:96 -#, c-format -msgid "Running post-installation trigger %s" -msgstr "Đang chạy bẫy sau-cài-đặt %s" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 -#, c-format -msgid "Directory '%s' missing" -msgstr "Thiếu thư mục “%s”" +#: apt-pkg/pkgcachegen.cc:87 +msgid "Cache has an incompatible versioning system" +msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format -msgid "Could not open file '%s'" -msgstr "Không thể mở tập tin “%s”" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" -#: apt-pkg/deb/dpkgpm.cc:970 -#, c-format -msgid "Preparing %s" -msgstr "Đang chuẩn bị %s" +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:971 -#, c-format -msgid "Unpacking %s" -msgstr "Đang mở gói %s" +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:976 -#, c-format -msgid "Preparing to configure %s" -msgstr "Đang chuẩn bị cấu hình %s" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:978 -#, c-format -msgid "Installed %s" -msgstr "Đã cài đặt %s" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/pkgcachegen.cc:570 #, c-format -msgid "Preparing for removal of %s" -msgstr "Đang chuẩn bị gỡ bỏ %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format -msgid "Removed %s" -msgstr "Đã gỡ bỏ %s" +msgid "Couldn't stat source package list %s" +msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/deb/dpkgpm.cc:990 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +msgid "Reading package lists" +msgstr "Đang đọc các danh sách gói" -#: apt-pkg/deb/dpkgpm.cc:991 -#, c-format -msgid "Completely removed %s" -msgstr "Gỡ bỏ hoàn toàn %s" +#: apt-pkg/pkgcachegen.cc:1304 +msgid "Collecting File Provides" +msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/deb/dpkgpm.cc:1046 -msgid "ioctl(TIOCGWINSZ) failed" -msgstr "ioctl(TIOCGWINSZ) gặp lỗi" +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +msgid "IO Error saving source cache" +msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/acquire-item.cc:139 #, c-format -msgid "Can not write log (%s)" -msgstr "Không thể ghi nhật ký (%s)" +msgid "rename failed, %s (%s -> %s)." +msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." -#: apt-pkg/deb/dpkgpm.cc:1049 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts đã gắn chưa?" +#: apt-pkg/acquire-item.cc:154 +msgid "Hash Sum mismatch" +msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" -#: apt-pkg/deb/dpkgpm.cc:1070 -msgid "Is stdout a terminal?" -msgstr "Đầu ra là thiết bị cuối?" +#: apt-pkg/acquire-item.cc:159 +msgid "Size mismatch" +msgstr "Kích cỡ không khớp nhau" -#: apt-pkg/deb/dpkgpm.cc:1558 -msgid "Operation was interrupted before it could finish" -msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" +#: apt-pkg/acquire-item.cc:164 +msgid "Invalid file format" +msgstr "Định dạng tập tập tin không hợp lệ" -#: apt-pkg/deb/dpkgpm.cc:1620 -msgid "No apport report written because MaxReports is reached already" +#: apt-pkg/acquire-item.cc:1570 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" msgstr "" -"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" +"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " +"sources.list hoặc tập tin bị hỏng)" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "dependency problems - leaving unconfigured" -msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" +#: apt-pkg/acquire-item.cc:1586 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/deb/dpkgpm.cc:1627 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " -"do một sự thất bại trước đó." +#: apt-pkg/acquire-item.cc:1628 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/acquire-item.cc:1666 +#, c-format msgid "" -"No apport report written because the error message indicates a disk full " -"error" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" +"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " +"này sẽ không được áp dụng." -#: apt-pkg/deb/dpkgpm.cc:1640 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " -"bộ nhớ”" +#: apt-pkg/acquire-item.cc:1688 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/acquire-item.cc:1718 +#, c-format msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"An error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " -"thống nội bộ" +"Gặp lỗi trong khi thẩm tra chữ ký.\n" +"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" +"Lỗi GPG: %s: %s\n" -#: apt-pkg/deb/dpkgpm.cc:1674 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#, c-format +msgid "GPG error: %s: %s" +msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" msgstr "" -"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " -"phải không?" +"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " +"này, do thiếu kiến trúc." -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/acquire-item.cc:1922 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +"The package index files are corrupted. No Filename: field for package %s." msgstr "" -"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " -"vấn đề này. " +"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " +"tin:) cho gói %s." -#: apt-pkg/deb/debsystem.cc:121 -msgid "Not locked" -msgstr "Chưa được khoá" +#: apt-pkg/indexrecords.cc:73 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" -#: cmdline/apt-extracttemplates.cc:100 +#: apt-pkg/indexrecords.cc:81 #, c-format -msgid "%s not a valid DEB package." -msgstr "%s không phải là một gói DEB hợp lệ." +msgid "No sections in Release file %s" +msgstr "Không có phần nào trong tập tin Phát hành %s" -#: cmdline/apt-extracttemplates.cc:234 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexrecords.cc:112 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" + +#: apt-pkg/indexrecords.cc:125 +#, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" -"\n" -"[extract: rút trích;\n" -"templates: mẫu]\n" -"\n" -"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" -"\tvà biểu mẫu đều từ gói Debian\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này\n" -" -t Đặt thư mục tạm thời\n" -" [t: viết tắt cho từ “temporary”: tạm thời]\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " +"hành %s" -#: cmdline/apt-extracttemplates.cc:308 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" +#: apt-pkg/indexrecords.cc:144 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "" +"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 -msgid "Package extension list is too long" -msgstr "Danh sách mở rộng gói quá dài" +#: apt-pkg/vendorlist.cc:78 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Khối nhà bán %s không chứa vân tay" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: apt-pkg/cdrom.cc:575 #, c-format -msgid "Error processing directory %s" -msgstr "Gặp lỗi khi xử lý thư mục %s" +msgid "Using CD-ROM mount point %s\n" +msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" -#: ftparchive/apt-ftparchive.cc:262 -msgid "Source extension list is too long" -msgstr "Danh sách mở rộng nguồn quá dài" +#: apt-pkg/cdrom.cc:583 +msgid "Unmounting CD-ROM\n" +msgstr "Đang bỏ gắn CD-ROM...\n" -#: ftparchive/apt-ftparchive.cc:379 -msgid "Error writing header to contents file" -msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" +#: apt-pkg/cdrom.cc:588 +msgid "Waiting for disc...\n" +msgstr "Đang đợi đĩa...\n" -#: ftparchive/apt-ftparchive.cc:409 +#: apt-pkg/cdrom.cc:597 +msgid "Mounting CD-ROM...\n" +msgstr "Đang gắn đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Đang nhận diện... " + +#: apt-pkg/cdrom.cc:643 #, c-format -msgid "Error processing contents %s" -msgstr "Gặp lỗi khi xử lý nội dung %s" +msgid "Stored label: %s\n" +msgstr "Nhãn đã lưu: %s\n" -#: ftparchive/apt-ftparchive.cc:597 +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Đang bỏ gắn CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 +msgid "Scanning disc for index files..\n" +msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" + +#: apt-pkg/cdrom.cc:717 +#, c-format msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" msgstr "" -"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" -"\n" -"[ftparchive: FTP archive: kho FTP]\n" -"\n" -"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" -" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" -" contents path\n" -" release path\n" -" generate config [các_nhóm]\n" -" clean config\n" -"\n" -"(packages: những gói;\n" -"binarypath: đường dẫn nhị phân;\n" -"sources: những nguồn;\n" -"srcpath: đường dẫn nguồn;\n" -"contents path: đường dẫn nội dung;\n" -"release path: đường dẫn bản đã phát hành;\n" -"generate config [groups]: tạo ra cấu hình [các nhóm];\n" -"clean config: cấu hình toàn mới)\n" -"\n" -"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" -"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" -"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" -"và dpkg-scansources (dpkg-quét_nguồn).\n" -"\n" -"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" -"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" -"cùng với băm MD5 và kích cỡ tập tin.\n" -"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" -"\n" -"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" -"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" -"để ghi rõ tập tin đè nguồn\n" -"\n" -"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" -"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " -"quy,\n" -"và tập tin đè nên chứa những cờ đè.\n" -"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" -"những trường tên tập tin nếu có.\n" -"Cách sử dụng thí dụ từ kho Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Tùy chọn:\n" -" -h _Trợ giúp_ này\n" -" --md5 Điều khiển cách tạo ra MD5\n" -" -s=? Tập tin đè nguồn\n" -" -q _Im lặng_ (không xuất chi tiết)\n" -" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" -" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" -" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" +"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" -#: ftparchive/apt-ftparchive.cc:803 -msgid "No selections matched" -msgstr "Không có cái được chọn khớp được" +#: apt-pkg/cdrom.cc:728 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " +"hoặc có kiến trúc không đúng?" -#: ftparchive/apt-ftparchive.cc:881 +#: apt-pkg/cdrom.cc:755 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." +msgid "Found label '%s'\n" +msgstr "Tìm thấy nhãn “%s”\n" -#: ftparchive/cachedb.cc:47 +#: apt-pkg/cdrom.cc:784 +msgid "That is not a valid name, try again.\n" +msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" + +#: apt-pkg/cdrom.cc:801 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Tên đĩa này:\n" +"“%s”\n" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/cdrom.cc:803 +msgid "Copying package lists..." +msgstr "Đang sao chép các danh sách gói..." + +#: apt-pkg/cdrom.cc:838 +msgid "Writing new source list\n" +msgstr "Đang ghi danh sách nguồn mới\n" + +#: apt-pkg/cdrom.cc:846 +msgid "Source list entries for this disc are:\n" +msgstr "Các mục tin danh sách nguồn cho đĩa này:\n" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" +msgid "Wrote %i records.\n" +msgstr "Đã ghi %i bản ghi.\n" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" + +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" + +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " -"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." +"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " +"nhau\n" -#: ftparchive/cachedb.cc:81 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." +msgid "Can't find authentication record for: %s" +msgstr "Không tìm thấy bản ghi xác thực cho: %s" -#: ftparchive/cachedb.cc:249 -msgid "Archive has no control record" -msgstr "Kho không có mục ghi điều khiển" +#: apt-pkg/indexcopy.cc:521 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "Sai khớp chuỗi duy nhất cho: %s" -#: ftparchive/cachedb.cc:490 -msgid "Unable to get a cursor" -msgstr "Không thể lấy con trỏ" +#: apt-pkg/cacheset.cc:469 +#, 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”" -#: ftparchive/writer.cc:82 +#: apt-pkg/cacheset.cc:472 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "CB: Không thể đọc thư mục %s\n" +msgid "Version '%s' for '%s' was not found" +msgstr "Không tìm thấy phiên bản “%s” cho “%s”" -#: ftparchive/writer.cc:87 +#: apt-pkg/cacheset.cc:583 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "CB: Không thể lấy thông tin thống kê %s\n" +msgid "Couldn't find task '%s'" +msgstr "Không tìm thấy tác vụ “%s”" -#: ftparchive/writer.cc:143 -msgid "E: " -msgstr "L: " +#: apt-pkg/cacheset.cc:589 +#, 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”" -#: ftparchive/writer.cc:145 -msgid "W: " -msgstr "CB: " +#: apt-pkg/cacheset.cc:600 +#, 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" -#: ftparchive/writer.cc:152 -msgid "E: Errors apply to file " -msgstr "LỖI: có lỗi áp dụng vào tập tin " +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +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ó" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: apt-pkg/cacheset.cc:621 #, c-format -msgid "Failed to resolve %s" -msgstr "Gặp lỗi khi phân giải %s" +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" -#: ftparchive/writer.cc:183 -msgid "Tree walking failed" -msgstr "Việc di chuyển qua cây bị lỗi" +#: apt-pkg/cacheset.cc:629 +#, 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ử" -#: ftparchive/writer.cc:210 +#: apt-pkg/cacheset.cc:637 #, c-format -msgid "Failed to open %s" -msgstr "Gặp lỗi khi mở %s" +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " +"đặt" + +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "Gửi kịch bản đến bộ phân giải" + +#: apt-pkg/edsp.cc:209 +msgid "Send request to solver" +msgstr "Gửi yêu cầu đến bộ phân giải" + +#: apt-pkg/edsp.cc:279 +msgid "Prepare for receiving solution" +msgstr "Chuẩn bị để lấy cách giải quyết" + +#: apt-pkg/edsp.cc:286 +msgid "External solver failed without a proper error message" +msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" + +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +msgid "Execute external solver" +msgstr "Thi hành bộ phân giải từ bên ngoài" + +#: apt-pkg/install-progress.cc:51 +#, c-format +msgid "Progress: [%3i%%]" +msgstr "Diễn biến: [%3i%%]" + +#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +msgid "Running dpkg" +msgstr "Đang chạy dpkg" + +#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " +"được dùng thay thế." -#: ftparchive/writer.cc:269 +#: apt-pkg/deb/dpkgpm.cc:91 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Bỏ liên kết %s [%s]\n" +msgid "Installing %s" +msgstr "Đang cài đặt %s" -#: ftparchive/writer.cc:277 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format -msgid "Failed to readlink %s" -msgstr "Gặp lỗi khi đọc liên kết %s" +msgid "Configuring %s" +msgstr "Đang cấu hình %s" -#: ftparchive/writer.cc:281 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format -msgid "Failed to unlink %s" -msgstr "Việc bỏ liên kết %s bị lỗi" +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s" -#: ftparchive/writer.cc:289 +#: apt-pkg/deb/dpkgpm.cc:94 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Gặp lỗi khi liên kết %s đến %s" +msgid "Completely removing %s" +msgstr "Đang gỡ bỏ hoàn toàn %s" -#: ftparchive/writer.cc:299 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Hết hạn bỏ liên kết của %sB.\n" - -#: ftparchive/writer.cc:404 -msgid "Archive had no package field" -msgstr "Kho không có trường gói" +msgid "Noting disappearance of %s" +msgstr "Đang ghi chép sự biến mất của %s" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: apt-pkg/deb/dpkgpm.cc:96 #, c-format -msgid " %s has no override entry\n" -msgstr " %s không có mục ghi đè (override)\n" +msgid "Running post-installation trigger %s" +msgstr "Đang chạy bẫy sau-cài-đặt %s" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " người bảo trì %s là %s không phải %s\n" +msgid "Directory '%s' missing" +msgstr "Thiếu thư mục “%s”" -#: ftparchive/writer.cc:712 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s không có mục ghi đè (override) nguồn\n" +msgid "Could not open file '%s'" +msgstr "Không thể mở tập tin “%s”" -#: ftparchive/writer.cc:716 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" - -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 -msgid "realloc - Failed to allocate memory" -msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" +msgid "Preparing %s" +msgstr "Đang chuẩn bị %s" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format -msgid "Unable to open %s" -msgstr "Không thể mở %s" +msgid "Unpacking %s" +msgstr "Đang mở gói %s" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:65 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Sai “override” %s dòng %llu (%s)" +msgid "Preparing to configure %s" +msgstr "Đang chuẩn bị cấu hình %s" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format -msgid "Failed to read the override file %s" -msgstr "Việc đọc tập tin đè %s bị lỗi" +msgid "Installed %s" +msgstr "Đã cài đặt %s" -#: ftparchive/override.cc:163 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Sai override %s dòng %llu #1" +msgid "Preparing for removal of %s" +msgstr "Đang chuẩn bị gỡ bỏ %s" -#: ftparchive/override.cc:175 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Sai override %s dòng %llu #2" +msgid "Removed %s" +msgstr "Đã gỡ bỏ %s" -#: ftparchive/override.cc:188 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Sai override %s dòng %llu #3" +msgid "Preparing to completely remove %s" +msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: ftparchive/multicompress.cc:70 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Không biết thuật toán nén “%s”" +msgid "Completely removed %s" +msgstr "Gỡ bỏ hoàn toàn %s" + +#: apt-pkg/deb/dpkgpm.cc:1046 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "ioctl(TIOCGWINSZ) gặp lỗi" -#: ftparchive/multicompress.cc:100 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" +msgid "Can not write log (%s)" +msgstr "Không thể ghi nhật ký (%s)" -#: ftparchive/multicompress.cc:189 -msgid "Failed to create FILE*" -msgstr "Việc tạo TẬP_TIN* bị lỗi" +#: apt-pkg/deb/dpkgpm.cc:1049 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts đã gắn chưa?" -#: ftparchive/multicompress.cc:192 -msgid "Failed to fork" -msgstr "Gặp lỗi khi rẽ nhánh tiến trình" +#: apt-pkg/deb/dpkgpm.cc:1070 +msgid "Is stdout a terminal?" +msgstr "Đầu ra là thiết bị cuối?" -#: ftparchive/multicompress.cc:206 -msgid "Compress child" -msgstr "Nén con" +#: apt-pkg/deb/dpkgpm.cc:1558 +msgid "Operation was interrupted before it could finish" +msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: ftparchive/multicompress.cc:229 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" +#: apt-pkg/deb/dpkgpm.cc:1620 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" -#: ftparchive/multicompress.cc:302 -msgid "IO to subprocess/file failed" -msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1625 +msgid "dependency problems - leaving unconfigured" +msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: ftparchive/multicompress.cc:340 -msgid "Failed to read while computing MD5" -msgstr "Gặp lỗi khi đọc trong khi tính MD5" +#: apt-pkg/deb/dpkgpm.cc:1627 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " +"do một sự thất bại trước đó." -#: ftparchive/multicompress.cc:356 -#, c-format -msgid "Problem unlinking %s" -msgstr "Gặp lỗi khi bỏ liên kết %s" +#: apt-pkg/deb/dpkgpm.cc:1633 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: cmdline/apt-internal-solver.cc:38 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -"Cách dùng: apt-internal-solver\n" -"\n" -"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" -"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" -"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này.\n" -" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " +"bộ nhớ”" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Không hiểu bản ghi gói!" +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " +"thống nội bộ" -#: cmdline/apt-sortpkgs.cc:153 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"No apport report written because the error message indicates a dpkg I/O error" msgstr "" -"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" -"\n" -"[sortpkgs: sort packages: sắp xếp các gói]\n" -"\n" -"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" -"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp_ này\n" -" -s Sắp xếp những tập tin _nguồn_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" + +#: apt-pkg/deb/debsystem.cc:84 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " +"phải không?" + +#: apt-pkg/deb/debsystem.cc:87 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:103 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" +"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " +"vấn đề này. " + +#: apt-pkg/deb/debsystem.cc:121 +msgid "Not locked" +msgstr "Chưa được khoá" + +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Đang dùng thư mục gắn đĩa CD-ROM %s\n" +#~ "Đang gắn đĩa CD-ROM...\n" #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " diff --git a/po/zh_CN.po b/po/zh_CN.po index 3b3e10554..7a97e6305 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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" @@ -156,7 +156,7 @@ msgstr " 软件包锁：" msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”" msgid "Please insert a Disc in the drive and press enter" msgstr "请把盘片插入驱动器再按回车键" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "无法将 %s 挂载到 %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" @@ -736,12 +736,12 @@ msgstr "找不到盘片。" msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -999,7 +999,7 @@ msgid "" "available:\n" msgstr "由于没有公钥，无法验证下列签名：\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1303,108 +1303,108 @@ msgstr "不经验证就安装这些软件包吗？" msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [已安装]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1412,27 +1412,27 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1441,7 +1441,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1449,21 +1449,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -1633,7 +1633,7 @@ msgstr "没有找到镜像文件 %s" msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" @@ -1983,47 +1983,47 @@ msgstr "override 文件 %s 第 %lu 行的格式有误 #2" msgid "Malformed override %s line %llu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误，无法创建 %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" @@ -2158,12 +2158,12 @@ msgstr "添加了两个转移项 %s-> %s" msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" @@ -2540,22 +2540,22 @@ msgstr "读取文件出错，还剩 %lu 字节没有读出" msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2813,7 +2813,7 @@ msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "软件包列表的目录 %spartial 缺失。" @@ -2982,35 +2982,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "无效的操作 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3019,12 +3019,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3033,12 +3033,12 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3074,50 +3074,41 @@ msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"现把 %s 作为了 CD-ROM 的挂载点\n" -"正在挂载 CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "正在鉴别.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "已归档文件的标签：%s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸载 CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "正在鉴别.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "已归档文件的标签：%s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸载 CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "正在盘片中查找索引文件..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3126,7 +3117,7 @@ msgstr "" "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签" "名\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3134,16 +3125,16 @@ msgstr "" "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" "架。" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "找到标签 '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请重试。\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3152,15 +3143,15 @@ msgstr "" "这张盘片现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "正在写入新的源列表\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" @@ -3443,6 +3434,13 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。" msgid "Not locked" msgstr "未锁定" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "现把 %s 作为了 CD-ROM 的挂载点\n" +#~ "正在挂载 CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/zh_TW.po b/po/zh_TW.po index 123cef942..09bdf0760 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-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+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." @@ -157,7 +157,7 @@ msgstr " 套件鎖定：" msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -255,12 +255,12 @@ msgstr "請替這張光碟取個名字，像是 'Debian 2.1r1 Disk 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "請把光碟放入光碟機，然後按下 [Enter] 鍵" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "無法將 %s 更名為 %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "請對您的光碟組中的其它光碟重複相同的操作。" @@ -728,12 +728,12 @@ msgstr "找不到磁碟。" msgid "File not found" msgstr "找不到檔案" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "無法設定修改時間" @@ -992,7 +992,7 @@ msgid "" "available:\n" msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1303,108 +1303,108 @@ msgstr "是否不經驗證就安裝這些套件？" msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "【已安裝】" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr "【已安裝】" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr "【已安裝】" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr "【已安裝】" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有未滿足的相依關係：" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "但 %s 卻已安裝" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "但 %s 卻將被安裝" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "但它卻無法安裝" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "但它是虛擬套件" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "但它卻尚未安裝" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "但它卻將不會被安裝" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr "或" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "下列【新】套件將會被安裝：" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "下列套件將會被【移除】：" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "下列套件將會維持其原有版本：" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "下列套件將會被升級：" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "下列套件將會被【降級】：" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "下列被保留 (hold) 的套件將會被更改：" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1412,27 +1412,27 @@ msgstr "" "【警告】：下列的基本套件都將被移除。\n" "除非您很清楚您在做什麼，否則請勿輕易嘗試！" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升級 %lu 個，新安裝 %lu 個，" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個，" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "降級 %lu 個，" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "移除 %lu 個，有 %lu 個未被升級。\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個沒有完整得安裝或移除。\n" @@ -1441,7 +1441,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1449,21 +1449,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -1631,7 +1631,7 @@ msgstr "無法開啟檔案 %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "無法和子程序建立 IPC 管線" @@ -1982,47 +1982,47 @@ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2" msgid "Malformed override %s line %llu #3" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的壓縮演算法 '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "要壓縮輸出 %s 需搭配壓縮動作" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "無法建立 FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork 時失敗" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "壓縮子程序" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "內部錯誤，無法建立 %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "和子程序/檔案 IO 失敗" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "在計算 MD5 時無法讀取到資料" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "在取消 %s 的連結時發生問題" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" @@ -2156,12 +2156,12 @@ msgstr "重複加入抽換資訊 %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" @@ -2540,22 +2540,22 @@ msgstr "讀取，仍有 %lu 未讀但已無空間" msgid "write, still have %llu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "在同步檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "在同步檔案時發生問題" @@ -2808,7 +2808,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "找不到清單目錄 %spartial。" @@ -2977,35 +2977,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "無效的操作 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3013,12 +3013,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3027,12 +3027,12 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3068,72 +3068,63 @@ msgstr "在 Release 檔 %s 裡沒有 Hash 項目" msgid "Vendor block %s contains no fingerprint" msgstr "提供者區塊 %s 沒有包含指紋碼" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"使用光碟機掛載點 %s\n" -"正在掛載光碟機\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "正在識別.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "保存標籤：%s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸載光碟機...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "正在卸載光碟機\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "正在等待碟片...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "正在掛載光碟機... \n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "正在識別.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "保存標籤：%s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸載光碟機...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "正在掃描碟片中的索引檔..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "找到標籤 '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "這並不是正確的名稱，請重試。\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3142,15 +3133,15 @@ msgstr "" "這個碟片名為：\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "正在複製套件清單..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "正在寫入新的來源列表\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" @@ -3431,6 +3422,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "使用光碟機掛載點 %s\n" +#~ "正在掛載光碟機\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n" -- cgit v1.2.3 From 28b4b983d95fa742a5431547285a748e8b856399 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 13 Feb 2014 14:22:24 +0100 Subject: use "Restrictions: allow-stderr and avoid apt-stderr.log in debian/tests/run-tests --- debian/tests/control | 3 ++- debian/tests/run-tests | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index e38921c7e..ae794f762 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,3 @@ Tests: run-tests -Depends: @, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4 \ No newline at end of file +Restrictions: allow-stderr +Depends: @, apt, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4 diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 233c5a386..d9a9db7bf 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,12 +2,9 @@ set -e -# auto-package-test is very unhappy if stuff it writen to stderr -exec 2> apt-stderr.log - # we need the buildin webserver for the tests if [ ! -e environment.mak ]; then - ./configure + make startup fi make -C test/interactive-helper/ -- cgit v1.2.3 From 52090faab4401ad6a2acb4d2c0c2cb53aa6b8f7f Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> 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 <david@kalnischkies.de> 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 @@ <refsect1><title>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 From 46a78c652d80818b4643c471432ae961b1ca5bd9 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 22 Feb 2014 18:07:43 +0100 Subject: remove auto-generated apt-key and sources.list on clean (closes: 739749) --- cmdline/makefile | 33 +++++++++++++++++++-------------- debian/changelog | 6 ++++++ vendor/debian/makefile | 4 ++++ vendor/raspbian/makefile | 3 +++ vendor/steamos/makefile | 4 ++++ vendor/ubuntu/makefile | 3 +++ 6 files changed, 39 insertions(+), 14 deletions(-) diff --git a/cmdline/makefile b/cmdline/makefile index 06f170b6a..f89192e10 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -40,20 +40,6 @@ LIB_MAKES = apt-pkg/makefile SOURCE = apt-cdrom.cc include $(PROGRAM_H) -# The apt-key program -apt-key: apt-key.in - sed -e "s#&keyring-filename;#$(shell ../vendor/getinfo keyring-filename)#" \ - -e "s#&keyring-removed-filename;#$(shell ../vendor/getinfo keyring-removed-filename)#" \ - -e "s#&keyring-master-filename;#$(shell ../vendor/getinfo keyring-master-filename)#" \ - -e "s#&keyring-uri;#$(shell ../vendor/getinfo keyring-uri)#" \ - -e "s#&keyring-package;#$(shell ../vendor/getinfo keyring-package)#" $< > $@ - chmod 755 $@ - -SOURCE=apt-key -TO=$(BIN) -TARGET=program -include $(COPY_H) - # The apt-mark program PROGRAM=apt-mark SLIBS = -lapt-pkg -lapt-private $(INTLLIBS) @@ -99,3 +85,22 @@ SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-dump-solver.cc include $(PROGRAM_H) + +# The apt-key program +apt-key: apt-key.in + sed -e "s#&keyring-filename;#$(shell ../vendor/getinfo keyring-filename)#" \ + -e "s#&keyring-removed-filename;#$(shell ../vendor/getinfo keyring-removed-filename)#" \ + -e "s#&keyring-master-filename;#$(shell ../vendor/getinfo keyring-master-filename)#" \ + -e "s#&keyring-uri;#$(shell ../vendor/getinfo keyring-uri)#" \ + -e "s#&keyring-package;#$(shell ../vendor/getinfo keyring-package)#" $< > $@ + chmod 755 $@ + +SOURCE=apt-key +TO=$(BIN) +TARGET=program +include $(COPY_H) + +clean: clean/apt-key + +clean/apt-key: + rm -f apt-key diff --git a/debian/changelog b/debian/changelog index 0780118ad..78c2d4573 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.9.15.4) UNRELEASED; urgency=low + + * remove auto-generated apt-key and sources.list on clean (closes: 739749) + + -- Michael Vogt <mvo@debian.org> Sat, 22 Feb 2014 17:58:08 +0100 + apt (0.9.15.3) unstable; urgency=medium [ Michael Vogt ] diff --git a/vendor/debian/makefile b/vendor/debian/makefile index 1f82d7f47..a1bb74f9b 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -9,3 +9,7 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ + +clean: + rm -f sources.list + diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile index ced566c30..e5513ead4 100644 --- a/vendor/raspbian/makefile +++ b/vendor/raspbian/makefile @@ -9,3 +9,6 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ + +clean: + rm -f sources.list diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile index c27494587..45ea18be2 100644 --- a/vendor/steamos/makefile +++ b/vendor/steamos/makefile @@ -9,3 +9,7 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@ + +clean: + rm -f sources.list + diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index c4b35935f..1fe138d2b 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -9,3 +9,6 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ + +clean: + rm -f sources.list -- cgit v1.2.3 From 5077916ef802948e6a3faab95b2d2a975438ec26 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 22 Feb 2014 18:22:04 +0100 Subject: improve clean for auto-generated sources.list --- vendor/debian/makefile | 4 +++- vendor/raspbian/makefile | 4 +++- vendor/steamos/makefile | 4 +++- vendor/ubuntu/makefile | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/vendor/debian/makefile b/vendor/debian/makefile index a1bb74f9b..25bc0350c 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -10,6 +10,8 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile index e5513ead4..c4464900f 100644 --- a/vendor/raspbian/makefile +++ b/vendor/raspbian/makefile @@ -10,5 +10,7 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile index 45ea18be2..9ee0e65a2 100644 --- a/vendor/steamos/makefile +++ b/vendor/steamos/makefile @@ -10,6 +10,8 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index 1fe138d2b..afcaaf718 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -10,5 +10,7 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list -- cgit v1.2.3 From 1e3f4083db29bba600b9725e9456b0e140975c99 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 22 Feb 2014 18:34:33 +0100 Subject: Fix typos in documentation (codespell) --- COMPILING | 2 +- README.ddtp | 4 ++-- README.make | 2 +- README.progress-reporting | 2 +- apt-inst/contrib/arfile.cc | 2 +- apt-inst/contrib/extracttar.cc | 2 +- apt-inst/extract.cc | 4 ++-- apt-inst/filelist.cc | 4 ++-- apt-pkg/acquire-item.cc | 20 ++++++++--------- apt-pkg/acquire-worker.cc | 2 +- apt-pkg/acquire.cc | 6 ++--- apt-pkg/algorithms.cc | 12 +++++----- apt-pkg/algorithms.h | 4 ++-- apt-pkg/aptconfiguration.cc | 8 +++---- apt-pkg/aptconfiguration.h | 10 ++++----- apt-pkg/cacheiterators.h | 6 ++--- apt-pkg/cdrom.h | 2 +- apt-pkg/clean.cc | 2 +- apt-pkg/contrib/cdromutl.cc | 4 ++-- apt-pkg/contrib/cmndline.cc | 2 +- apt-pkg/contrib/crc-16.cc | 2 +- apt-pkg/contrib/error.h | 2 +- apt-pkg/contrib/fileutl.cc | 6 ++--- apt-pkg/contrib/gpgv.h | 2 +- apt-pkg/contrib/macros.h | 2 +- apt-pkg/contrib/md5.h | 2 +- apt-pkg/contrib/mmap.h | 4 ++-- apt-pkg/contrib/progress.h | 2 +- apt-pkg/contrib/sha2_internal.cc | 2 +- apt-pkg/contrib/strutl.cc | 10 ++++----- apt-pkg/deb/deblistparser.cc | 2 +- apt-pkg/deb/debsystem.cc | 2 +- apt-pkg/deb/debversion.cc | 4 ++-- apt-pkg/depcache.cc | 6 ++--- apt-pkg/depcache.h | 2 +- apt-pkg/edsp.h | 6 ++--- apt-pkg/indexfile.h | 4 ++-- apt-pkg/orderlist.cc | 8 +++---- apt-pkg/packagemanager.cc | 16 ++++++------- apt-pkg/pkgcache.cc | 4 ++-- apt-pkg/pkgcache.h | 2 +- apt-pkg/pkgsystem.h | 4 ++-- apt-pkg/upgrade.cc | 2 +- buildlib/fail.mak | 2 +- buildlib/program.mak | 2 +- cmdline/apt-config.cc | 2 +- cmdline/apt-get.cc | 4 ++-- cmdline/apt-internal-solver.cc | 6 ++--- cmdline/apt-key.in | 4 ++-- configure.ac | 2 +- debian/apt.cron.daily | 4 ++-- debian/changelog | 4 ++++ doc/Bugs | 8 +++---- doc/design.sgml | 2 +- doc/dpkg-tech.sgml | 6 ++--- doc/examples/configure-index | 2 +- doc/files.sgml | 2 +- doc/libapt-pkg2_to_3.txt | 4 ++-- doc/method.sgml | 6 ++--- doc/style.txt | 8 +++---- ftparchive/apt-ftparchive.cc | 2 +- methods/file.cc | 2 +- methods/ftp.cc | 4 ++-- methods/ftp.h | 2 +- methods/http.cc | 4 ++-- methods/http.h | 2 +- methods/https.cc | 4 ++-- methods/https.h | 2 +- methods/mirror.cc | 6 ++--- methods/mirror.h | 2 +- methods/rfc2553emu.h | 2 +- methods/rsh.cc | 2 +- methods/server.cc | 6 ++--- test/integration/framework | 2 +- test/integration/test-apt-get-source | 2 +- ...17690-allow-unauthenticated-makes-all-untrusted | 2 +- .../test-sourceslist-arch-plusminus-options | 2 +- test/libapt/globalerror_test.cc | 26 +++++++++++----------- 78 files changed, 171 insertions(+), 167 deletions(-) diff --git a/COMPILING b/COMPILING index bc934c846..1076c6366 100644 --- a/COMPILING +++ b/COMPILING @@ -27,7 +27,7 @@ I am not interested in making 'ultra portable code'. I will accept patches to make the code that already exists conform more to SUS or POSIX, but I don't really care if your not-SUS OS doesn't work. It is simply too much work to maintain patches for dysfunctional OSs. I highly suggest you -contact your vendor and express intrest in a conforming C library. +contact your vendor and express interest in a conforming C library. That said, there are lots of finicky problems that must be dealt with even between the supported OS's. Primarily the path I choose to take is to put diff --git a/README.ddtp b/README.ddtp index 98f6109aa..5865b4e02 100644 --- a/README.ddtp +++ b/README.ddtp @@ -52,7 +52,7 @@ is md5("XXX\n YYY\n .\n ZZZ\n") (perl-syntax). A future APT version will download one or some 'Translate-$lang' file(s) at 'update'-time. After this download it show a translated description instead of the english form, if it found a translated -description of the package with the right md5 chechsum. The enviroment +description of the package with the right md5 chechsum. The environment of the user will controlled this process (LANG, LANGUAGE, LC_MESSAGES, etc). With this the package system will never show a outdated translation. @@ -60,7 +60,7 @@ translation. The translations come all from the DDTP. A daily process on ddtp.debian.org make new 'Translated-$lang' files and a script on ftp-master request this files and move this to the debian archive. -Now the first files are accessable at +Now the first files are accessible at <a href="http://ddtp.debian.org/pdesc/translatefiles/">http://ddtp.debian.org/pdesc/translatefiles/</a> If you found wrong translations, please read the guides on diff --git a/README.make b/README.make index 69d79d37a..db5f36e94 100644 --- a/README.make +++ b/README.make @@ -25,7 +25,7 @@ of these parameters will have an immediate effect. The use of makefile.in and configure substitutions across build makefiles is not used at all. Furthermore, the make system runs with a current directory equal to the -source directory irregardless of the destination directory. This means +source directory regardless of the destination directory. This means #include "" and #include <> work as expected and more importantly running 'make' in the source directory will work as expected. The environment variable or make parameter 'BUILD' sets the build directory. diff --git a/README.progress-reporting b/README.progress-reporting index b575e7879..91c0a8ac0 100644 --- a/README.progress-reporting +++ b/README.progress-reporting @@ -2,7 +2,7 @@ Install-progress reporting -------------------------- If the apt options: "APT::Status-Fd" is set, apt will send status -reports to that fd. The status information is seperated with a ':', +reports to that fd. The status information is separated with a ':', there are the following status conditions: status = {"pmstatus", "dlstatus", "conffile-prompt", "error", "media-change" } diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 9d84c1784..77dbc55d6 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -6,7 +6,7 @@ AR File - Handle an 'AR' archive AR Archives have plain text headers at the start of each file - section. The headers are aligned on a 2 byte boundry. + section. The headers are aligned on a 2 byte boundary. Information about the structure of AR files can be found in ar(5) on a BSD system, or in the binutils source. diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index fb4db42f8..2437c9749 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -6,7 +6,7 @@ Extract a Tar - Tar Extractor Some performance measurements showed that zlib performed quite poorly - in comparision to a forked gzip process. This tar extractor makes use + in comparison to a forked gzip process. This tar extractor makes use of the fact that dup'd file descriptors have the same seek pointer and that gzip will not read past the end of a compressed stream, even if there is more data. We use the dup property to track extraction diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index 2c95fba92..b3dfccfc6 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -10,7 +10,7 @@ object is unpacked to '.dpkg.new' then the original is hardlinked to '.dpkg.tmp' and finally the new object is renamed to overwrite the old one. From an external perspective the file never ceased to exist. - After the archive has been sucessfully unpacked the .dpkg.tmp files + After the archive has been successfully unpacked the .dpkg.tmp files are erased. A failure causes all the .dpkg.tmp files to be restored. Decisions about unpacking go like this: @@ -22,7 +22,7 @@ [Note, this is reduced to only check if a file was expected to be there] - If the existing link/file is not a directory then it is replaced - irregardless + regardless - If the existing link/directory is being replaced by a directory then absolutely nothing happens. - If the existing link/directory is being replaced by a link then diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index 879c07855..defc4f4df 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -5,14 +5,14 @@ File Listing - Manages a Cache of File -> Package names. - Diversions add some signficant complexity to the system. To keep + Diversions add some significant complexity to the system. To keep storage space down in the very special case of a diverted file no extra bytes are allocated in the Node structure. Instead a diversion is inserted directly into the hash table and its flag bit set. Every lookup for that filename will always return the diversion. The hash buckets are stored in sorted form, with diversions having - the higest sort order. Identical files are assigned the same file + the highest sort order. Identical files are assigned the same file pointer, thus after a search all of the nodes owning that file can be found by iterating down the bucket. diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 60003c023..36bb48382 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -129,7 +129,7 @@ void pkgAcquire::Item::Done(string Message,unsigned long long Size,string Hash, /*}}}*/ // Acquire::Item::Rename - Rename a file /*{{{*/ // --------------------------------------------------------------------- -/* This helper function is used by alot of item methods as thier final +/* This helper function is used by a lot of item methods as their final step */ void pkgAcquire::Item::Rename(string From,string To) { @@ -299,7 +299,7 @@ void pkgAcqSubIndex::Done(string Message,unsigned long long Size,string Md5Hash, return; } - // sucess in downloading the index + // success in downloading the index // rename the index if(Debug) std::clog << "Renaming: " << DestFile << " -> " << FinalFile << std::endl; @@ -327,7 +327,7 @@ bool pkgAcqSubIndex::ParseIndex(string const &IndexFile) /*{{{*/ /*}}}*/ // AcqDiffIndex::AcqDiffIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- -/* Get the DiffIndex file first and see if there are patches availabe +/* Get the DiffIndex file first and see if there are patches available * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the * patches. If anything goes wrong in that process, it will fall back to * the original packages file @@ -548,7 +548,7 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{ { if(Debug) std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl - << "Falling back to normal index file aquire" << std::endl; + << "Falling back to normal index file acquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc, ExpectedHash); @@ -569,7 +569,7 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,string Md5Hash string FinalFile; FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); - // sucess in downloading the index + // success in downloading the index // rename the index FinalFile += string(".IndexDiff"); if(Debug) @@ -628,7 +628,7 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{ { if(Debug) std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl - << "Falling back to normal index file aquire" << std::endl; + << "Falling back to normal index file acquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, ExpectedHash); Finish(); @@ -733,7 +733,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has string FinalFile; FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); - // sucess in downloading a diff, enter ApplyDiff state + // success in downloading a diff, enter ApplyDiff state if(State == StateFetchDiff) { @@ -825,7 +825,7 @@ void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) // first failure means we should fallback State = StateErrorDiff; - std::clog << "Falling back to normal index file aquire" << std::endl; + std::clog << "Falling back to normal index file acquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, ExpectedHash); } @@ -1240,7 +1240,7 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, /*{{{*/ if (RealFileExists(Final) == true) { // File was already in place. It needs to be re-downloaded/verified - // because Release might have changed, we do give it a differnt + // because Release might have changed, we do give it a different // name than DestFile because otherwise the http method will // send If-Range requests and there are too many broken servers // out there that do not understand them @@ -2021,7 +2021,7 @@ bool pkgAcqArchive::QueueNext() return true; } - /* Hmm, we have a file and its size does not match, this shouldnt + /* Hmm, we have a file and its size does not match, this shouldn't happen.. */ unlink(FinalFile.c_str()); } diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 44c3e4e17..de62080da 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -568,7 +568,7 @@ bool pkgAcquire::Worker::InFdReady() /*}}}*/ // Worker::MethodFailure - Called when the method fails /*{{{*/ // --------------------------------------------------------------------- -/* This is called when the method is belived to have failed, probably because +/* This is called when the method is believed to have failed, probably because read returned -1. */ bool pkgAcquire::Worker::MethodFailure() { diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index a8a5abd34..120e809e1 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -5,9 +5,9 @@ Acquire - File Acquiration - The core element for the schedual system is the concept of a named + The core element for the schedule system is the concept of a named queue. Each queue is unique and each queue has a name derived from the - URI. The degree of paralization can be controled by how the queue + URI. The degree of paralization can be controlled by how the queue name is derived from the URI. ##################################################################### */ @@ -175,7 +175,7 @@ void pkgAcquire::Add(Worker *Work) // --------------------------------------------------------------------- /* A worker has died. This can not be done while the select loop is running as it would require that RunFds could handling a changing list state and - it cant.. */ + it can't.. */ void pkgAcquire::Remove(Worker *Work) { if (Running == true) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 8644a8138..0363ab3e2 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -424,7 +424,7 @@ void pkgProblemResolver::MakeScores() /* This is arbitrary, it should be high enough to elevate an essantial package above most other packages but low enough to allow an obsolete essential packages to be removed by - a conflicts on a powerfull normal package (ie libc6) */ + a conflicts on a powerful normal package (ie libc6) */ if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential || (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) Score += PrioEssentials; @@ -441,7 +441,7 @@ void pkgProblemResolver::MakeScores() Score += PrioInstalledAndNotObsolete; } - // Now that we have the base scores we go and propogate dependencies + // Now that we have the base scores we go and propagate dependencies for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I) { if (Cache[I].InstallVer == 0) @@ -485,7 +485,7 @@ void pkgProblemResolver::MakeScores() } } - /* Now we propogate along provides. This makes the packages that + /* Now we propagate along provides. This makes the packages that provide important packages extremely important */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I) { @@ -640,7 +640,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) adjusting the package will inflict. It goes from highest score to lowest and corrects all of the breaks by - keeping or removing the dependant packages. If that fails then it removes + keeping or removing the dependent packages. If that fails then it removes the package itself and goes on. The routine should be able to intelligently go from any broken state to a fixed state. @@ -830,7 +830,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) /* Look across the version list. If there are no possible targets then we keep the package and bail. This is necessary - if a package has a dep on another package that cant be found */ + if a package has a dep on another package that can't be found */ SPtrArray<pkgCache::Version *> VList = Start.AllTargets(); if (*VList == 0 && (Flags[I->ID] & Protected) != Protected && Start.IsNegative() == false && @@ -1183,7 +1183,7 @@ bool pkgProblemResolver::ResolveByKeepInternal() continue; /* Keep the package. If this works then great, otherwise we have - to be significantly more agressive and manipulate its dependencies */ + to be significantly more aggressive and manipulate its dependencies */ if ((Flags[I->ID] & Protected) == 0) { if (Debug == true) diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 5a9a77415..489d81159 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -10,7 +10,7 @@ see all of the effects of an upgrade run. pkgDistUpgrade computes an upgrade that causes as many packages as - possible to move to the newest verison. + possible to move to the newest version. pkgApplyStatus sets the target state based on the content of the status field in the status file. It is important to get proper crash recovery. @@ -44,7 +44,7 @@ using std::ostream; #endif #ifndef APT_9_CLEANER_HEADERS -// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatiblity +// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatibility #include <apt-pkg/upgrade.h> #include <apt-pkg/update.h> #endif diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 1ebcf97bc..0b0b546c5 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -27,9 +27,9 @@ #include <vector> /*}}}*/ namespace APT { -// getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/ +// getCompressionTypes - Return Vector of usable compressiontypes /*{{{*/ // --------------------------------------------------------------------- -/* return a vector of compression types in the prefered order. */ +/* return a vector of compression types in the preferred order. */ std::vector<std::string> const Configuration::getCompressionTypes(bool const &Cached) { static std::vector<std::string> types; @@ -109,7 +109,7 @@ const Configuration::getCompressionTypes(bool const &Cached) { /*}}}*/ // GetLanguages - Return Vector of Language Codes /*{{{*/ // --------------------------------------------------------------------- -/* return a vector of language codes in the prefered order. +/* return a vector of language codes in the preferred order. the special word "environment" will be replaced with the long and the short code of the local settings and it will be insured that this will not add duplicates. So in an german local the setting "environment, de_DE, en, de" @@ -330,7 +330,7 @@ bool const Configuration::checkLanguage(std::string Lang, bool const All) { return (std::find(langs.begin(), langs.end(), Lang) != langs.end()); } /*}}}*/ -// getArchitectures - Return Vector of prefered Architectures /*{{{*/ +// getArchitectures - Return Vector of preferred Architectures /*{{{*/ std::vector<std::string> const Configuration::getArchitectures(bool const &Cached) { using std::string; diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index d22b675c0..bf7deae85 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -37,14 +37,14 @@ public: /*{{{*/ * \param Cached saves the result so we need to calculated it only once * this parameter should ony be used for testing purposes. * - * \return a vector of the compression types in the prefered usage order + * \return a vector of the compression types in the preferred usage order */ std::vector<std::string> static const getCompressionTypes(bool const &Cached = true); /** \brief Returns a vector of Language Codes * * Languages can be defined with their two or five chars long code. - * This methods handles the various ways to set the prefered codes, + * This methods handles the various ways to set the preferred codes, * honors the environment and ensures that the codes are not listed twice. * * The special word "environment" will be replaced with the long and the short @@ -52,7 +52,7 @@ public: /*{{{*/ * duplicates. So in an german local the setting "environment, de_DE, en, de" * will result in "de_DE, de, en". * - * Another special word is "none" which separates the prefered from all codes + * Another special word is "none" which separates the preferred from all codes * in this setting. So setting and method can be used to get codes the user want * to see or to get all language codes APT (should) have Translations available. * @@ -62,7 +62,7 @@ public: /*{{{*/ * \param Locale don't get the locale from the system but use this one instead * this parameter should ony be used for testing purposes. * - * \return a vector of (all) Language Codes in the prefered usage order + * \return a vector of (all) Language Codes in the preferred usage order */ std::vector<std::string> static const getLanguages(bool const &All = false, bool const &Cached = true, char const ** const Locale = 0); @@ -80,7 +80,7 @@ public: /*{{{*/ * \param Cached saves the result so we need to calculated it only once * this parameter should ony be used for testing purposes. * - * \return a vector of Architectures in prefered order + * \return a vector of Architectures in preferred order */ std::vector<std::string> static const getArchitectures(bool const &Cached = true); diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 886d84838..ea6a4afba 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -46,7 +46,7 @@ template<typename Str, typename Itr> class pkgCache::Iterator : * The implementation of this method should be pretty short * as it will only return the Pointer into the mmap stored * in the owner but the name of this pointer is different for - * each stucture and we want to abstract here at least for the + * each structure and we want to abstract here at least for the * basic methods from the actual structure. * \return Pointer to the first structure of this type */ @@ -198,7 +198,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { /** \brief compares two version and returns if they are similar This method should be used to identify if two pseudo versions are - refering to the same "real" version */ + referring to the same "real" version */ inline bool SimilarVer(const VerIterator &B) const { return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0); }; @@ -419,7 +419,7 @@ class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> { inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {}; }; /*}}}*/ -// Inlined Begin functions cant be in the class because of order problems /*{{{*/ +// Inlined Begin functions can't be in the class because of order problems /*{{{*/ inline pkgCache::PkgIterator pkgCache::GrpIterator::PackageList() const {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);}; inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index db637b96d..c58593550 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -88,7 +88,7 @@ struct CdromDevice /*{{{*/ class pkgUdevCdromDevices /*{{{*/ { protected: - // libudev dlopen stucture + // libudev dlopen structure void *libudev_handle; struct udev* (*udev_new)(void); int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value); diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc index eae419e34..2dea8ffdd 100644 --- a/apt-pkg/clean.cc +++ b/apt-pkg/clean.cc @@ -105,7 +105,7 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache) break; } - // See if this verison matches the file + // See if this version matches the file if (IsFetchable == true && Ver == V.VerStr()) break; } diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index afa01a562..20210ec0a 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -47,8 +47,8 @@ bool IsMounted(string &Path) if (Path[Path.length() - 1] != '/') Path += '/'; - /* First we check if the path is actualy mounted, we do this by - stating the path and the previous directory (carefull of links!) + /* First we check if the path is actually mounted, we do this by + stating the path and the previous directory (careful of links!) and comparing their device fields. */ struct stat Buf,Buf2; if (stat(Path.c_str(),&Buf) != 0 || diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 2086d91ca..ed5800007 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -293,7 +293,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[], // Look for an argument. while (1) { - // Look at preceeding text + // Look at preceding text char Buffer[300]; if (Argument == 0) { diff --git a/apt-pkg/contrib/crc-16.cc b/apt-pkg/contrib/crc-16.cc index 4058821f9..f5df2d8b1 100644 --- a/apt-pkg/contrib/crc-16.cc +++ b/apt-pkg/contrib/crc-16.cc @@ -10,7 +10,7 @@ Al Longyear <longyear@netcom.com> Modified by Jason Gunthorpe <jgg@debian.org> to fit the local coding - style, this code is belived to be in the Public Domain. + style, this code is believed to be in the Public Domain. ##################################################################### */ /*}}}*/ diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 7d09b2d4a..bcee70b1a 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -229,7 +229,7 @@ public: /*{{{*/ /** \brief is the list empty? * * The default checks if the list is empty or contains only notices, - * if you want to check if also no notices happend set the parameter + * if you want to check if also no notices happened set the parameter * flag to \b false. * * \param WithoutNotice does notices count, default is \b true, so no diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 536284064..52411a762 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -222,7 +222,7 @@ int GetLock(string File,bool Errors) int FD = open(File.c_str(),O_RDWR | O_CREAT | O_NOFOLLOW,0640); if (FD < 0) { - // Read only .. cant have locking problems there. + // Read only .. can't have locking problems there. if (errno == EROFS) { _error->Warning(_("Not using locking for read only lock file %s"),File.c_str()); @@ -238,7 +238,7 @@ int GetLock(string File,bool Errors) } SetCloseExec(FD,true); - // Aquire a write lock + // Acquire a write lock struct flock fl; fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; @@ -1256,7 +1256,7 @@ FileFd::~FileFd() /*}}}*/ // FileFd::Read - Read a bit of the file /*{{{*/ // --------------------------------------------------------------------- -/* We are carefull to handle interruption by a signal while reading +/* We are careful to handle interruption by a signal while reading gracefully. */ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) { diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 45f069058..1d79a52ac 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -29,7 +29,7 @@ * for reading. Use #OpenMaybeClearSignedFile to access the message * instead to ensure you are only reading signed data. * - * The method does not return, but has some noteable exit-codes: + * The method does not return, but has some notable exit-codes: * 111 signals an internal error like the inability to execute gpgv, * 112 indicates a clear-signed file which doesn't include a message, * which can happen if APT is run while on a network requiring diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 62e7b65db..e53d01b8f 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -44,7 +44,7 @@ #define _boundv(a,b,c) b = _bound(a,b,c) #define ABS(a) (((a) < (0)) ?-(a) : (a)) -/* Usefull count macro, use on an array of things and it will return the +/* Useful count macro, use on an array of things and it will return the number of items in the array */ #define _count(a) (sizeof(a)/sizeof(a[0])) diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 25631b166..195455645 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -10,7 +10,7 @@ store a MD5Sum in 16 bytes of memory. A MD5Sum is used to generate a (hopefully) unique 16 byte number for a - block of data. This can be used to gaurd against corruption of a file. + block of data. This can be used to guard against corruption of a file. MD5 should not be used for tamper protection, use SHA or something more secure. diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 6bd4a2d86..c1dfedf6d 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -6,7 +6,7 @@ MMap Class - Provides 'real' mmap or a faked mmap using read(). The purpose of this code is to provide a generic way for clients to - access the mmap function. In enviroments that do not support mmap + access the mmap function. In environments that do not support mmap from file fd's this function will use read and normal allocated memory. @@ -15,7 +15,7 @@ The DynamicMMap class is used to help the on-disk data structure generators. It provides a large allocated workspace and members - to allocate space from the workspace in an effecient fashion. + to allocate space from the workspace in an efficient fashion. This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 3a6943aee..f7fbc9ccf 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -7,7 +7,7 @@ This class allows lengthy operations to communicate their progress to the GUI. The progress model is simple and is not designed to handle - the complex case of the multi-activity aquire class. + the complex case of the multi-activity acquire class. The model is based on the concept of an overall operation consisting of a series of small sub operations. Each sub operation has it's own diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc index f84fb761c..bb2560252 100644 --- a/apt-pkg/contrib/sha2_internal.cc +++ b/apt-pkg/contrib/sha2_internal.cc @@ -65,7 +65,7 @@ * Please make sure that your system defines BYTE_ORDER. If your * architecture is little-endian, make sure it also defines * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are - * equivilent. + * equivalent. * * If your system does not define the above, then you can do so by * hand like this: diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 962112854..d4f53ea3a 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -426,7 +426,7 @@ string TimeToStr(unsigned long Sec) /*}}}*/ // SubstVar - Substitute a string for another string /*{{{*/ // --------------------------------------------------------------------- -/* This replaces all occurances of Subst with Contents in Str. */ +/* This replaces all occurrences of Subst with Contents in Str. */ string SubstVar(const string &Str,const string &Subst,const string &Contents) { string::size_type Pos = 0; @@ -926,7 +926,7 @@ bool FTPMDTMStrToTime(const char* const str,time_t &time) /*}}}*/ // StrToTime - Converts a string into a time_t /*{{{*/ // --------------------------------------------------------------------- -/* This handles all 3 populare time formats including RFC 1123, RFC 1036 +/* This handles all 3 popular time formats including RFC 1123, RFC 1036 and the C library asctime format. It requires the GNU library function 'timegm' to convert a struct tm in UTC to a time_t. For some bizzar reason the C library does not provide any such function :< This also @@ -1313,7 +1313,7 @@ string StripEpoch(const string &VerStr) // tolower_ascii - tolower() function that ignores the locale /*{{{*/ // --------------------------------------------------------------------- /* This little function is the most called method we have and tries - therefore to do the absolut minimum - and is noteable faster than + therefore to do the absolut minimum - and is notable faster than standard tolower/toupper and as a bonus avoids problems with different locales - we only operate on ascii chars anyway. */ int tolower_ascii(int const c) @@ -1324,9 +1324,9 @@ int tolower_ascii(int const c) } /*}}}*/ -// CheckDomainList - See if Host is in a , seperate list /*{{{*/ +// CheckDomainList - See if Host is in a , separate list /*{{{*/ // --------------------------------------------------------------------- -/* The domain list is a comma seperate list of domains that are suffix +/* The domain list is a comma separate list of domains that are suffix matched against the argument */ bool CheckDomainList(const string &Host,const string &List) { diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 68d544e1f..acdcc4554 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -758,7 +758,7 @@ bool debListParser::GrabWord(string Word,WordList *List,unsigned char &Out) /*}}}*/ // ListParser::Step - Move to the next section in the file /*{{{*/ // --------------------------------------------------------------------- -/* This has to be carefull to only process the correct architecture */ +/* This has to be careful to only process the correct architecture */ bool debListParser::Step() { iOffset = Tags.Offset(); diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 7ed6936c3..b95ff15df 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -193,7 +193,7 @@ bool debSystem::Initialize(Configuration &Cnf) /*}}}*/ // System::ArchiveSupported - Is a file format supported /*{{{*/ // --------------------------------------------------------------------- -/* The standard name for a deb is 'deb'.. There are no seperate versions +/* The standard name for a deb is 'deb'.. There are no separate versions of .deb to worry about.. */ bool debSystem::ArchiveSupported(const char *Type) { diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index 140561262..74e2552ff 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -116,7 +116,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd, return 1; } - // Shouldnt happen + // Shouldn't happen return 1; } /*}}}*/ @@ -221,7 +221,7 @@ bool debVersioningSystem::CheckDep(const char *PkgVer, if (PkgVer == DepVer) return Op == pkgCache::Dep::Equals || Op == pkgCache::Dep::LessEq || Op == pkgCache::Dep::GreaterEq; - // Perform the actual comparision. + // Perform the actual comparison. int const Res = CmpVersion(PkgVer, DepVer); switch (Op) { diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c39e8c628..a12e6963d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -789,7 +789,7 @@ bool pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser, // - this makes sense as default when all Garbage dependencies // are automatically marked for removal (as aptitude does). // setting a package for keep then makes it no longer autoinstalled - // for all other use-case this action is rather suprising + // for all other use-case this action is rather surprising if(FromUser && !P.Marked) P.Flags &= ~Flag::Auto; #endif @@ -1195,7 +1195,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } - /* This bit is for processing the possibilty of an install/upgrade + /* This bit is for processing the possibility of an install/upgrade fixing the problem for "positive" dependencies */ if (Start.IsNegative() == false && (DepState[Start->ID] & DepCVer) == DepCVer) { @@ -1315,7 +1315,7 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, // (simple string-compare as stuff like '1' == '0:1-0' can't happen here) if (P->CurrentVer == 0 || strcmp(Pkg.CandVersion(), P.CandVersion()) == 0) continue; - // packages loosing M-A:same can be out-of-sync + // packages losing M-A:same can be out-of-sync VerIterator CV = PkgState[P->ID].CandidateVerIter(*this); if (unlikely(CV.end() == true) || (CV->MultiArch & pkgCache::Version::Same) != pkgCache::Version::Same) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 61c9aa559..f6848f383 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -15,7 +15,7 @@ This structure is important to support the readonly status of the cache file. When the data is saved the cache will be refereshed from our - internal rep and written to disk. Then the actual persistant data + internal rep and written to disk. Then the actual persistent data files will be put on the disk. Each dependency is compared against 3 target versions to produce to diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index 12b06d143..fd4436f60 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -2,7 +2,7 @@ /** Description \file edsp.h {{{ ###################################################################### Set of methods to help writing and reading everything needed for EDSP - with the noteable exception of reading a scenario for conversion into + with the notable exception of reading a scenario for conversion into a Cache as this is handled by edsp interface for listparser and friends ##################################################################### */ /*}}}*/ @@ -182,13 +182,13 @@ public: * they were unable to calculate a solution for a given task. * Obviously they can't send a solution through, so this * methods deals with formatting an error message correctly - * so that the front-ends can recieve and display it. + * so that the front-ends can receive and display it. * * The first line of the message should be a short description * of the error so it can be used for dialog titles or alike * * \param uuid of this error message - * \param message is free form text to discribe the error + * \param message is free form text to describe the error * \param output the front-end listens for error messages */ bool static WriteError(char const * const uuid, std::string const &message, FILE* output); diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 2d433b60a..a0096fa34 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -10,12 +10,12 @@ Binary index files Binary translation files - Bianry index files decribing the local system + Binary index files describing the local system Source index files They are all bundled together here, and the interfaces for sources.list, acquire, cache gen and record parsing all use this class - to acess the underlying representation. + to access the underlying representation. ##################################################################### */ /*}}}*/ diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 984ae1d10..21b5fc4e7 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -566,10 +566,10 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical) // --------------------------------------------------------------------- /* This is the core ordering routine. It calls the set dependency consideration functions which then potentialy call this again. Finite - depth is achived through the colouring mechinism. */ + depth is achieved through the colouring mechinism. */ bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from) { - // Looping or irrelevent. + // Looping or irrelevant. // This should probably trancend not installed packages if (Pkg.end() == true || IsFlag(Pkg,Added) == true || IsFlag(Pkg,AddPending) == true || IsFlag(Pkg,InList) == false) @@ -824,7 +824,7 @@ bool pkgOrderList::DepUnPackPre(DepIterator D) The forwards depends loop is designed to bring the packages dependents close to the package. This helps reduce deconfigure time. - Loops are irrelevent to this. */ + Loops are irrelevant to this. */ bool pkgOrderList::DepUnPackDep(DepIterator D) { @@ -840,7 +840,7 @@ bool pkgOrderList::DepUnPackDep(DepIterator D) D.ParentPkg().CurrentVer() != D.ParentVer()) continue; - // The dep will not break so it is irrelevent. + // The dep will not break so it is irrelevant. if (CheckDep(D) == true) continue; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 3fdd9b637..5f9a31264 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -215,7 +215,7 @@ bool pkgPackageManager::CreateOrderList() return true; } /*}}}*/ -// PM::DepAlwaysTrue - Returns true if this dep is irrelevent /*{{{*/ +// PM::DepAlwaysTrue - Returns true if this dep is irrelevant /*{{{*/ // --------------------------------------------------------------------- /* The restriction on provides is to eliminate the case when provides are transitioning between valid states [ie exim to smail] */ @@ -243,11 +243,11 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D, D->Type != pkgCache::Dep::Obsoletes) continue; - // The package hasnt been changed + // The package hasn't been changed if (List->IsNow(Pkg) == false) continue; - // Ignore self conflicts, ignore conflicts from irrelevent versions + // Ignore self conflicts, ignore conflicts from irrelevant versions if (D.IsIgnorable(Pkg) || D.ParentVer() != D.ParentPkg().CurrentVer()) continue; @@ -314,7 +314,7 @@ bool pkgPackageManager::ConfigureAll() Note on failure: This method can fail, without causing any problems. This can happen when using Immediate-Configure-All, SmartUnPack may call - SmartConfigure, it may fail because of a complex dependancy situation, but + SmartConfigure, it may fail because of a complex dependency situation, but a error will only be reported if ConfigureAll fails. This is why some of the messages this function reports on failure (return false;) as just warnings only shown when debuging*/ @@ -596,7 +596,7 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg) /*}}}*/ // PM::SmartUnPack - Install helper /*{{{*/ // --------------------------------------------------------------------- -/* This puts the system in a state where it can Unpack Pkg, if Pkg is allready +/* This puts the system in a state where it can Unpack Pkg, if Pkg is already unpacked, or when it has been unpacked, if Immediate==true it configures it. */ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) { @@ -623,7 +623,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c /* PreUnpack Checks: This loop checks and attempts to rectify and problems that would prevent the package being unpacked. It addresses: PreDepends, Conflicts, Obsoletes and Breaks (DpkgBreaks). Any resolutions that do not require it should avoid configuration (calling SmartUnpack with Immediate=true), this is because when unpacking some packages with - complex dependancy structures, trying to configure some packages while breaking the loops can complicate things . + complex dependency structures, trying to configure some packages while breaking the loops can complicate things . This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured), or by the ConfigureAll call at the end of the for loop in OrderInstall. */ bool Changed = false; @@ -790,7 +790,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c { if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop) { - // This dependancy has already been dealt with by another SmartUnPack on Pkg + // This dependency has already been dealt with by another SmartUnPack on Pkg break; } else @@ -1003,7 +1003,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() DoneSomething = true; if (ImmConfigureAll) { - /* ConfigureAll here to pick up and packages left unconfigured becuase they were unpacked in the + /* ConfigureAll here to pick up and packages left unconfigured because they were unpacked in the "PreUnpack Checks" section */ if (!ConfigureAll()) return Failed; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 52e814c0b..67a2a709d 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -8,7 +8,7 @@ Please see doc/apt-pkg/cache.sgml for a more detailed description of this format. Also be sure to keep that file up-to-date!! - This is the general utility functions for cache managment. They provide + This is the general utility functions for cache management. They provide a complete set of accessor functions for the cache. The cacheiterators header contains the STL-like iterators that can be used to easially navigate the cache as well as seemlessly dereference the mmap'd @@ -499,7 +499,7 @@ pkgCache::PkgIterator::CurVersion() const // ostream operator to handle string representation of a package /*{{{*/ // --------------------------------------------------------------------- /* Output name < cur.rent.version -> candid.ate.version | new.est.version > (section) - Note that the characters <|>() are all literal above. Versions will be ommited + Note that the characters <|>() are all literal above. Versions will be omitted if they provide no new information (e.g. there is no newer version than candidate) If no version and/or section can be found "none" is used. */ std::ostream& diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 1a7013551..c31c5f30b 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -354,7 +354,7 @@ struct pkgCache::Group the hash index of the name in the pkgCache::Header::PkgHashTable A package can be created for every architecture so package names are - not unique, but it is garanteed that packages with the same name + not unique, but it is guaranteed that packages with the same name are sequencel ordered in the list. Packages with the same name can be accessed with the Group. */ diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index 75f7b9fcc..eb75df412 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -7,7 +7,7 @@ Instances of this class can be thought of as factories or meta-classes for a variety of more specialized classes. Together this class and - it's speciallized offspring completely define the environment and how + it's specialized offspring completely define the environment and how to access resources for a specific system. There are several sub areas that are all orthogonal - each system has a unique combination of these sub areas: @@ -23,7 +23,7 @@ - Selection of local 'status' indexes that make up the pkgCache. It is important to note that the handling of index files is not a - function of the system. Index files are handled through a seperate + function of the system. Index files are handled through a separate abstraction - the only requirement is that the index files have the same idea of versioning as the target system. diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index f06f6d40d..d6f6933dd 100644 --- a/apt-pkg/upgrade.cc +++ b/apt-pkg/upgrade.cc @@ -225,7 +225,7 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) Cache.MarkInstall(I, false, 0, false); else { - // If keep didnt actually do anything then there was no change.. + // If keep didn't actually do anything then there was no change.. if (Cache[I].Upgrade() == false) Change = true; } diff --git a/buildlib/fail.mak b/buildlib/fail.mak index dfc194e1e..fc187766d 100644 --- a/buildlib/fail.mak +++ b/buildlib/fail.mak @@ -4,7 +4,7 @@ # Input # $(MESSAGE) - The message to show -# $(PROGRAM) - The program/libary/whatever. +# $(PROGRAM) - The program/library/whatever. # See defaults.mak for information about LOCAL diff --git a/buildlib/program.mak b/buildlib/program.mak index e0e76316c..da538f5eb 100644 --- a/buildlib/program.mak +++ b/buildlib/program.mak @@ -6,7 +6,7 @@ # $(SOURCE) - The source code to use # $(PROGRAM) - The name of the program # $(SLIBS) - Shared libs to link against -# $(LIB_MAKES) - Shared libary make files to depend on - to ensure we get +# $(LIB_MAKES) - Shared library make files to depend on - to ensure we get # remade when the shared library version increases. # See defaults.mak for information about LOCAL diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 3481eaf5f..30c2a22d5 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -8,7 +8,7 @@ This program will parse a config file and then do something with it. Commands: - shell - Shell mode. After this a series of word pairs should occure. + shell - Shell mode. After this a series of word pairs should occur. The first is the environment var to set and the second is the key to set it from. Use like: eval `apt-config shell QMode apt::QMode` diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4d609104c..12e385b69 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -15,7 +15,7 @@ upgrade - Smart-Download the newest versions of all packages dselect-upgrade - Follows dselect's changes to the Status: field and installes new and removes old packages - dist-upgrade - Powerfull upgrader designed to handle the issues with + dist-upgrade - Powerful upgrader designed to handle the issues with a new distribution. install - Download and install a given package (by name, not by .deb) check - Update the package cache and check for broken packages @@ -513,7 +513,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) } /* Resolve any problems that dselect created, allupgrade cannot handle - such things. We do so quite agressively too.. */ + such things. We do so quite aggressively too.. */ if (Cache->BrokenCount() != 0) { pkgProblemResolver Fix(Cache); diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index 53b38ea43..bf5b8c1fe 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -160,16 +160,16 @@ int main(int argc,const char *argv[]) /*{{{*/ if (upgrade == true) { if (pkgAllUpgrade(CacheFile) == false) { - EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occured", output); + EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occurred", output); return 0; } } else if (distUpgrade == true) { if (pkgDistUpgrade(CacheFile) == false) { - EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occured", output); + EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occurred", output); return 0; } } else if (Fix.Resolve() == false) { - EDSP::WriteError("ERR_UNSOLVABLE", "An error occured", output); + EDSP::WriteError("ERR_UNSOLVABLE", "An error occurred", output); return 0; } diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 0ced500db..0774cf4b7 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -18,7 +18,7 @@ touch $SECRETKEYRING GPG_CMD="$GPG_CMD --homedir $GPGHOMEDIR" # create the trustdb with an (empty) dummy keyring # older gpgs required it, newer gpgs even warn that it isn't needed, -# but require it nontheless for some commands, so we just play safe +# but require it nonetheless for some commands, so we just play safe # here for the foreseeable future and create a dummy one $GPG_CMD --quiet --check-trustdb --keyring $SECRETKEYRING >/dev/null 2>&1 # tell gpg that it shouldn't try to maintain a trustdb file @@ -187,7 +187,7 @@ remove_key_from_keyring() { echo >&2 "Key ${2} is in keyring ${1}, but can't be removed as it is read only." return fi - # check if it is the only key in the keyring and if so remove the keyring alltogether + # check if it is the only key in the keyring and if so remove the keyring altogether if [ '1' = "$($GPG --with-colons --list-keys | grep "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]\+:" | wc -l)" ]; then mv -f "$1" "${1}~" # behave like gpg return diff --git a/configure.ac b/configure.ac index a5a9fe0b8..083e7c494 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl linux architectures and configurations, it is not used to make the dnl code more portable dnl You MUST have an environment that has all the POSIX functions and -dnl some of the more populare bsd/sysv ones (like select). You'll also +dnl some of the more popular bsd/sysv ones (like select). You'll also dnl need a C++ compiler that is semi-standard conformant, exceptions are dnl not used but STL is. diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 2616af1dd..71ac76555 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -34,7 +34,7 @@ # APT::Archives::MinAge "2"; (old, deprecated) # APT::Periodic::MinAge "2"; (new) # - Set minimum age of a package file. If a file is younger it -# will not be deleted (0=disable). Usefull to prevent races +# will not be deleted (0=disable). Useful to prevent races # and to keep backups of the packages for emergency. # # APT::Archives::MaxSize "0"; (old, deprecated) @@ -384,7 +384,7 @@ fi now=$(date +%s) # Support old Archive for compatibility. -# Document only Periodic for all controling parameters of this script. +# Document only Periodic for all controlling parameters of this script. UpdateInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) diff --git a/debian/changelog b/debian/changelog index 78c2d4573..eb5e079bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ apt (0.9.15.4) UNRELEASED; urgency=low + [ Michael Vogt ] * remove auto-generated apt-key and sources.list on clean (closes: 739749) + + [ Guillem Jover ] + * Fix typos in documentation (codespell) -- Michael Vogt <mvo@debian.org> Sat, 22 Feb 2014 17:58:08 +0100 diff --git a/doc/Bugs b/doc/Bugs index deb7334db..d584dce49 100644 --- a/doc/Bugs +++ b/doc/Bugs @@ -31,12 +31,12 @@ #27601: srange errors from dselect Summary: Couldn't locate an archive source Status: Require status file - Believed to be fixed in 0.1.9, was not reproducable w/ given + Believed to be fixed in 0.1.9, was not reproducible w/ given status file #27841: apt: apt depends on a missing library Status: New versions of APT in slink have been compiled with libstdc++2.9 #23984: apt: support for "no_proxy" would be nice - Status: Planed to be integrated into the new methods via the configuration + Status: Planned to be integrated into the new methods via the configuration file Done - Use Acquire::http::proxy::host.com="DIRECT" #25021: apt: Need some control over multiple connections @@ -83,7 +83,7 @@ Status: Fix the man pages. This certainly will be done in 0.3.0 #24799: Some suggestions for the apt method in dselect Summary: Wants to be able to specifiy -d from dselect - Status: Likely a APT_OPTIONS enviornment variable will be created, -d can + Status: Likely a APT_OPTIONS environment variable will be created, -d can be put there. There is already an APT_CONFIG in 0.3, APT_OPTIONS may also appear.. @@ -112,7 +112,7 @@ APT now sends a max age header. See the apt.conf(5) #28172: HTTP Proxy cache refresh should be forced for corrupted packages Summary: Some problem resulted in a corrupted package - Status: I belive this reflects a deeper problem and the suggested solution + Status: I believe this reflects a deeper problem and the suggested solution is only a band-aide patch. I intend to close this bug when #24685 is fixed with a configuration directive. Use -o acquire::http::no-cache=true diff --git a/doc/design.sgml b/doc/design.sgml index 1ddf49fd8..67406aa01 100644 --- a/doc/design.sgml +++ b/doc/design.sgml @@ -48,7 +48,7 @@ that additional functionality in the underlying dpkg would also be requested.</p> - <p> Diety/dselect are the first introduction that people have to + <p> Deity/dselect are the first introduction that people have to Debian, and unfortunately this first impression contributes greatly to the public perception of the distribution. It is imperative that this be a showcase for Debian, rather than diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml index 1a15f6a4c..ce0c5fa83 100644 --- a/doc/dpkg-tech.sgml +++ b/doc/dpkg-tech.sgml @@ -322,7 +322,7 @@ The main principal of the new-format Debian archive (I won't describe the old format - for that have a look at deb-old.5), is that the archive really is an archive - as used by "ar" and friends. However, dpkg-deb uses this format internally, rather than calling "ar". Inside this archive, there are usually -the folowing members:- +the following members:- <list> <item>debian-binary @@ -349,7 +349,7 @@ supports the following options:- <item>--build (-b) <dir> - builds a .deb archive, takes a directory which contains all the files as an argument. Note that the directory <dir>/DEBIAN will be packed separately into the control archive. -<item>--contents (-c) <debfile> - Lists the contents of ther "data.tar.gz" +<item>--contents (-c) <debfile> - Lists the contents of the "data.tar.gz" member. <item>--control (-e) <debfile> - Extracts the control archive into a directory called DEBIAN. Alternatively, with another argument, it will extract @@ -450,7 +450,7 @@ cleaned up when dpkg exits cleanly. <p> Juding by the use of the updates directory I would call it a Journal. Inorder -to effeciently ensure the complete integrity of the status file dpkg will +to efficiently ensure the complete integrity of the status file dpkg will "checkpoint" or journal all of it's activities in the updates directory. By merging the contents of the updates directory (in order!!) against the original status file it can get the precise current state of the system, diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f4d9d17f2..93e96cf16 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -142,7 +142,7 @@ APT // APT::Archives::MinAge "2"; (old, deprecated) MinAge "2"; // (new) // - Set minimum age of a package file. If a file is younger it - // will not be deleted (0=disable). Usefull to prevent races + // will not be deleted (0=disable). Useful to prevent races // and to keep backups of the packages for emergency. // APT::Archives::MaxSize "0"; (old, deprecated) diff --git a/doc/files.sgml b/doc/files.sgml index a52efc756..56c7f574d 100644 --- a/doc/files.sgml +++ b/doc/files.sgml @@ -201,7 +201,7 @@ from partial into archives/. Any files found in archives/ can be assumed to be verified. <p> -No directory structure is transfered from the receiving site and all .deb +No directory structure is transferred from the receiving site and all .deb file names conform to debian conventions. No short (msdos) filename should be placed in archives. If the need arises .debs should be unpacked, scanned and renamed to their correct internal names. This is mostly to prevent diff --git a/doc/libapt-pkg2_to_3.txt b/doc/libapt-pkg2_to_3.txt index c1f71f9f2..b94dc666e 100644 --- a/doc/libapt-pkg2_to_3.txt +++ b/doc/libapt-pkg2_to_3.txt @@ -3,7 +3,7 @@ people need to be aware of.. Many of this changes are done so that most old source will continue to function, but perhaps at reduced functionality. * pkgDepCache is no longer self initilizing, you have to call the Init - method seperately after constructing it. Users of pkgCacheFile do not + method separately after constructing it. Users of pkgCacheFile do not need to worry about this * GetCandidateVer/etc is gone from the pkgCache. It exists only in the DepCache and is just an inline around the new Policy class @@ -55,7 +55,7 @@ source will continue to function, but perhaps at reduced functionality. (should be transparent largely) * Locking is handled differently, there is no dpkg lock class, the _system class provides Lock/UnLock methods -* pkgDepCache is not a subclass of pkgCache, it agregates it now. Some +* pkgDepCache is not a subclass of pkgCache, it aggregates it now. Some compatibility functions are provided that make this transition fairly easy. * The following functions have had minor argument changes: diff --git a/doc/method.sgml b/doc/method.sgml index 27db50173..5aa7b52e8 100644 --- a/doc/method.sgml +++ b/doc/method.sgml @@ -246,14 +246,14 @@ pre-transfer status for Internet type methods. Fields: Message <tag>200 URI Start<item> -Indicates the URI is starting to be transfered. The URI is specified +Indicates the URI is starting to be transferred. The URI is specified along with stats about the file itself. Fields: URI, Size, Last-Modified, Resume-Point <tag>201 URI Done<item> -Indicates that a URI has completed being transfered. It is possible +Indicates that a URI has completed being transferred. It is possible to specify a <em>201 URI Done</> without a <em>URI Start</> which would -mean no data was transfered but the file is now available. A Filename +mean no data was transferred but the file is now available. A Filename field is specified when the URI is directly available in the local pathname space. APT will either directly use that file or copy it into another location. It is possible to return Alt-* fields to indicate that diff --git a/doc/style.txt b/doc/style.txt index 2072251d0..7658b0314 100644 --- a/doc/style.txt +++ b/doc/style.txt @@ -9,7 +9,7 @@ Ver - A version Indenting, Comments, Etc ~~~~~~~~~~~~~~~~~~~~~~~~ Would make Linus cry :P However it is what I prefer. 3 space indent, -8 space tab all braces on seperate lines, function return on the same line +8 space tab all braces on separate lines, function return on the same line as the function, cases aligned with their code. The 'indent' options for this style are: indent -bl -bli0 -di1 -i3 -nsc -ts8 -npcs -npsl @@ -60,13 +60,13 @@ almost always designates a change in ownership rules). * Pass by non-const reference may be used to indicate a OUT type variable * Pass by pointer (except in the case where the pointer is really an array) should be used when the object will be retained or ownership will be - transfered. Ownership transference should be rare and noted by a comment. + transferred. Ownership transference should be rare and noted by a comment. * Standard C things (FILE * etc) should be left as is. * Return by references should indicate a borrowed object * Return by pointer (except arrays) should indicate ownership is - transfered. Return by pointer should not be used unless ownership is - transfered. + transferred. Return by pointer should not be used unless ownership is + transferred. * Return by pointer to variable indicates ownership transfer unless the pointer is an 'input' parameter (designated generally by an =0, indicating a default of 'none') diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 2639bc2f6..712f8469a 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -864,7 +864,7 @@ bool Generate(CommandLine &CmdL) unsigned long MaxContentsChange = Setup.FindI("Default::MaxContentsChange",UINT_MAX)*1024; for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); ++I) { - // This record is not relevent + // This record is not relevant if (I->ContentsDone == true || I->Contents.empty() == true) continue; diff --git a/methods/file.cc b/methods/file.cc index 7ed4e6f60..3d0687c5b 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -5,7 +5,7 @@ File URI method for APT - This simply checks that the file specified exists, if so the relevent + This simply checks that the file specified exists, if so the relevant information is returned. If a .gz filename is specified then the file name with .gz removed will also be checked and information about it will be returned in Alt-* diff --git a/methods/ftp.cc b/methods/ftp.cc index 70bf4f607..621f48476 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -3,7 +3,7 @@ // $Id: ftp.cc,v 1.31.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### - FTP Aquire Method - This is the FTP aquire method for APT. + FTP Acquire Method - This is the FTP acquire method for APT. This is a very simple implementation that does not try to optimize at all. Commands are sent syncronously with the FTP server (as the @@ -946,7 +946,7 @@ FtpMethod::FtpMethod() : pkgAcqMethod("1.0",SendConfig) /*}}}*/ // FtpMethod::SigTerm - Handle a fatal signal /*{{{*/ // --------------------------------------------------------------------- -/* This closes and timestamps the open file. This is neccessary to get +/* This closes and timestamps the open file. This is necessary to get resume behavoir on user abort */ void FtpMethod::SigTerm(int) { diff --git a/methods/ftp.h b/methods/ftp.h index 2634f0732..8055c389f 100644 --- a/methods/ftp.h +++ b/methods/ftp.h @@ -3,7 +3,7 @@ // $Id: ftp.h,v 1.4 2001/03/06 07:15:29 jgg Exp $ /* ###################################################################### - FTP Aquire Method - This is the FTP aquire method for APT. + FTP Acquire Method - This is the FTP acquire method for APT. ##################################################################### */ /*}}}*/ diff --git a/methods/http.cc b/methods/http.cc index 96c4e3ca0..42b31beeb 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -3,7 +3,7 @@ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### - HTTP Acquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP acquire method for APT. It uses HTTP/1.1 and many of the fancy options there-in, such as pipelining, range, if-range and so on. @@ -732,7 +732,7 @@ void HttpMethod::SendReq(FetchItem *Itm) } // If we ask for uncompressed files servers might respond with content- - // negotation which lets us end up with compressed files we do not support, + // negotiation which lets us end up with compressed files we do not support, // see 657029, 657560 and co, so if we have no extension on the request // ask for text only. As a sidenote: If there is nothing to negotate servers // seem to be nice and ignore it. diff --git a/methods/http.h b/methods/http.h index 02c04e8ae..450a42eed 100644 --- a/methods/http.h +++ b/methods/http.h @@ -3,7 +3,7 @@ // $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ /* ###################################################################### - HTTP Acquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP acquire method for APT. ##################################################################### */ /*}}}*/ diff --git a/methods/https.cc b/methods/https.cc index e713be19f..febe6a0f0 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -3,7 +3,7 @@ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### - HTTPS Acquire Method - This is the HTTPS aquire method for APT. + HTTPS Acquire Method - This is the HTTPS acquire method for APT. It uses libcurl @@ -309,7 +309,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr); // If we ask for uncompressed files servers might respond with content- - // negotation which lets us end up with compressed files we do not support, + // negotiation which lets us end up with compressed files we do not support, // see 657029, 657560 and co, so if we have no extension on the request // ask for text only. As a sidenote: If there is nothing to negotate servers // seem to be nice and ignore it. diff --git a/methods/https.h b/methods/https.h index 89a89d19c..ab0dd3407 100644 --- a/methods/https.h +++ b/methods/https.h @@ -3,7 +3,7 @@ // $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ /* ###################################################################### - HTTP Acquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP acquire method for APT. ##################################################################### */ /*}}}*/ diff --git a/methods/mirror.cc b/methods/mirror.cc index 83ef0d133..085f3717b 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -3,7 +3,7 @@ // $Id: mirror.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### - Mirror Aquire Method - This is the Mirror aquire method for APT. + Mirror Acquire Method - This is the Mirror acquire method for APT. ##################################################################### */ /*}}}*/ @@ -49,7 +49,7 @@ using namespace std; * of the failure that is also send to LP * * TODO: - * - deal with runing as non-root because we can't write to the lists + * - deal with running as non-root because we can't write to the lists dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here * and better error handling there! @@ -290,7 +290,7 @@ bool MirrorMethod::InitMirrors() // FIXME: make the mirror selection more clever, do not // just use the first one! // BUT: we can not make this random, the mirror has to be - // stable accross session, because otherwise we can + // stable across session, because otherwise we can // get into sync issues (got indexfiles from mirror A, // but packages from mirror B - one might be out of date etc) ifstream in(MirrorFile.c_str()); diff --git a/methods/mirror.h b/methods/mirror.h index 81e531e21..1dd9f2ec6 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -3,7 +3,7 @@ // $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ /* ###################################################################### - MIRROR Aquire Method - This is the MIRROR aquire method for APT. + MIRROR Acquire Method - This is the MIRROR acquire method for APT. ##################################################################### */ /*}}}*/ diff --git a/methods/rfc2553emu.h b/methods/rfc2553emu.h index b15facb31..ad7ddf48a 100644 --- a/methods/rfc2553emu.h +++ b/methods/rfc2553emu.h @@ -75,7 +75,7 @@ #endif /* If we don't have getaddrinfo then we probably don't have - sockaddr_storage either (same RFC) so we definately will not be + sockaddr_storage either (same RFC) so we definitely will not be doing any IPv6 stuff. Do not use the members of this structure to retain portability, cast to a sockaddr. */ #define sockaddr_storage sockaddr_in diff --git a/methods/rsh.cc b/methods/rsh.cc index 4e1aaea26..550f77eca 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -255,7 +255,7 @@ bool RSHConn::WriteMsg(std::string &Text,bool Sync,const char *Fmt,...) /*}}}*/ // RSHConn::Size - Return the size of the file /*{{{*/ // --------------------------------------------------------------------- -/* Right now for successfull transfer the file size must be known in +/* Right now for successful transfer the file size must be known in advance. */ bool RSHConn::Size(const char *Path,unsigned long long &Size) { diff --git a/methods/server.cc b/methods/server.cc index 6dd3970a6..ef90c809c 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -86,7 +86,7 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File) if (Result == 100) continue; - // Tidy up the connection persistance state. + // Tidy up the connection persistence state. if (Encoding == Closes && HaveContent == true) Persistent = false; @@ -146,7 +146,7 @@ bool ServerState::HeaderLine(string Line) return _error->Error(_("The HTTP server sent an invalid reply header")); } - /* Check the HTTP response header to get the default persistance + /* Check the HTTP response header to get the default persistence state. */ if (Major < 1) Persistent = false; @@ -366,7 +366,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res) /*}}}*/ // ServerMethod::SigTerm - Handle a fatal signal /*{{{*/ // --------------------------------------------------------------------- -/* This closes and timestamps the open file. This is neccessary to get +/* This closes and timestamps the open file. This is necessary to get resume behavoir on user abort */ void ServerMethod::SigTerm(int) { diff --git a/test/integration/framework b/test/integration/framework index 08d796a10..63df86df7 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -947,7 +947,7 @@ URI: $1 Filename: ${2} " # simple worker keeping stdin open until we are done (201) or error (400) - # and requesting new URIs on try-agains/redirects inbetween + # and requesting new URIs on try-agains/redirects in-between { tail -n 999 -f "$DOWNLOG" & echo "TAILPID: $!"; } | while read f1 f2; do if [ "$f1" = 'TAILPID:' ]; then TAILPID="$f2" diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source index 083e26db1..33bd980d0 100755 --- a/test/integration/test-apt-get-source +++ b/test/integration/test-apt-get-source @@ -65,7 +65,7 @@ Need to get 0 B of source archives. 'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo=1.0 # select by release with no binary package (Bug#731102) but ensure to get -# higest version +# highest version testequal "$HEADER Selected version '0.1' (wheezy) for foo Need to get 0 B of source archives. diff --git a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted index 633c197c0..f93510fd7 100755 --- a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted +++ b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted @@ -11,7 +11,7 @@ buildsimplenativepackage 'cool' 'i386' '1.0' 'unstable' setupaptarchive --no-update testfileexists() { - msgtest 'Test for existance of file' "$1" + msgtest 'Test for existence of file' "$1" test -e "$1" && msgpass || msgfail rm -f "$1" } diff --git a/test/integration/test-sourceslist-arch-plusminus-options b/test/integration/test-sourceslist-arch-plusminus-options index 0d4d7448f..0091964e6 100755 --- a/test/integration/test-sourceslist-arch-plusminus-options +++ b/test/integration/test-sourceslist-arch-plusminus-options @@ -76,7 +76,7 @@ echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > testbinaries 'substract from a arch-set' 'i386' echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list -testbinaries 'useless substract from a arch-set' 'i386' +testbinaries 'useless subtract from a arch-set' 'i386' echo 'deb [arch=mips,i386 arch+=armhf] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list testbinaries 'addition to a arch-set' 'i386' 'mips' 'armhf' diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc index 72044d493..b6939231d 100644 --- a/test/libapt/globalerror_test.cc +++ b/test/libapt/globalerror_test.cc @@ -15,17 +15,17 @@ int main(int argc,char *argv[]) equals(_error->empty(), true); equals(_error->empty(GlobalError::DEBUG), false); equals(_error->PendingError(), false); - equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false); equals(_error->PendingError(), true); std::string text; equals(_error->PopMessage(text), false); equals(_error->PendingError(), true); equals(text, "A Notice"); equals(_error->PopMessage(text), true); - equals(text, "Something horrible happend 2 times"); + equals(text, "Something horrible happened 2 times"); equals(_error->empty(GlobalError::DEBUG), true); equals(_error->PendingError(), false); - equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false); equals(_error->PendingError(), true); equals(_error->empty(GlobalError::FATAL), false); _error->Discard(); @@ -33,7 +33,7 @@ int main(int argc,char *argv[]) equals(_error->empty(), true); equals(_error->PendingError(), false); equals(_error->Notice("%s Notice", "A"), false); - equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false); equals(_error->PendingError(), true); equals(_error->empty(GlobalError::NOTICE), false); _error->PushToStack(); @@ -49,12 +49,12 @@ int main(int argc,char *argv[]) equals(_error->PendingError(), true); equals(text, "A Notice"); equals(_error->PopMessage(text), true); - equals(text, "Something horrible happend 2 times"); + equals(text, "Something horrible happened 2 times"); equals(_error->PendingError(), false); equals(_error->empty(), true); equals(_error->Notice("%s Notice", "A"), false); - equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false); equals(_error->PendingError(), true); equals(_error->empty(GlobalError::NOTICE), false); _error->PushToStack(); @@ -70,7 +70,7 @@ int main(int argc,char *argv[]) equals(_error->PendingError(), true); equals(text, "A Notice"); equals(_error->PopMessage(text), true); - equals(text, "Something horrible happend 2 times"); + equals(text, "Something horrible happened 2 times"); equals(_error->PendingError(), false); equals(_error->empty(), false); equals(_error->PopMessage(text), false); @@ -78,24 +78,24 @@ int main(int argc,char *argv[]) equals(_error->empty(), true); errno = 0; - equals(_error->Errno("errno", "%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->Errno("errno", "%s horrible %s %d times", "Something", "happened", 2), false); equals(_error->empty(), false); equals(_error->PendingError(), true); equals(_error->PopMessage(text), true); equals(_error->PendingError(), false); - equals(text, std::string("Something horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")")); + equals(text, std::string("Something horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")")); equals(_error->empty(), true); std::string longText; for (size_t i = 0; i < 500; ++i) longText.append("a"); - equals(_error->Error("%s horrible %s %d times", longText.c_str(), "happend", 2), false); + equals(_error->Error("%s horrible %s %d times", longText.c_str(), "happened", 2), false); equals(_error->PopMessage(text), true); - equals(text, std::string(longText).append(" horrible happend 2 times")); + equals(text, std::string(longText).append(" horrible happened 2 times")); - equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happend", 2), false); + equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happened", 2), false); equals(_error->PopMessage(text), true); - equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")")); + equals(text, std::string(longText).append(" horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")")); equals(_error->Warning("Репозиторий не обновлён и будут %d %s", 4, "test"), false); equals(_error->PopMessage(text), false); -- cgit v1.2.3 From bef4b142853642db669f6ffea54fa52c9b52cd95 Mon Sep 17 00:00:00 2001 From: Jon Severinsson <jon@severinsson.net> Date: Sat, 22 Feb 2014 18:40:09 +0100 Subject: add apt-vendor information for tanglu --- doc/apt-verbatim.ent | 1 + vendor/getinfo | 3 +++ vendor/makefile | 2 ++ vendor/tanglu/apt-vendor.ent | 7 +++++++ vendor/tanglu/makefile | 11 +++++++++++ vendor/tanglu/sources.list.in | 7 +++++++ 6 files changed, 31 insertions(+) create mode 100644 vendor/tanglu/apt-vendor.ent create mode 100644 vendor/tanglu/makefile create mode 100644 vendor/tanglu/sources.list.in diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 966ca2b0f..d191c08fa 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -226,6 +226,7 @@ <!ENTITY stable-codename "wheezy"> <!ENTITY testing-codename "jessie"> <!ENTITY stable-version "7"> +<!ENTITY tanglu-codename "bartholomea"> <!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… diff --git a/vendor/getinfo b/vendor/getinfo index 861fd3d17..4422f5d78 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -23,6 +23,9 @@ case "$1" in debian-stable-codename) getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; +tanglu-codename) + getrawfield 'tanglu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + ;; ubuntu-codename) getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; diff --git a/vendor/makefile b/vendor/makefile index c05b516ef..619c603fb 100644 --- a/vendor/makefile +++ b/vendor/makefile @@ -32,9 +32,11 @@ current: # if we haven't found a specific, look for a deriving in hardcoded order test -e $@ || \ (dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \ + (dpkg-vendor --derives-from tanglu && cp ln -s tanglu $@ ) || \ ln -s debian $@ .PHONY: clean veryclean all binary vendor +.NOPARALLEL: clean: clean/current diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent new file mode 100644 index 000000000..4b70a5f82 --- /dev/null +++ b/vendor/tanglu/apt-vendor.ent @@ -0,0 +1,7 @@ +<!-- details about the keys used by the distribution --> +<!ENTITY keyring-distro "Tanglu"> +<!ENTITY keyring-package "<package>tanglu-archive-keyring</package>"> +<!ENTITY keyring-filename "<filename>/usr/share/keyrings/tanglu-archive-keyring.gpg</filename>"> +<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/tanglu-archive-removed-keys.gpg</filename>"> +<!ENTITY keyring-master-filename ""> +<!ENTITY keyring-uri ""> diff --git a/vendor/tanglu/makefile b/vendor/tanglu/makefile new file mode 100644 index 000000000..175db1a8c --- /dev/null +++ b/vendor/tanglu/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/tanglu + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc binary manpages: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&tanglu-codename;#$(shell ../getinfo tanglu-codename)#g' $< > $@ diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in new file mode 100644 index 000000000..dfa219046 --- /dev/null +++ b/vendor/tanglu/sources.list.in @@ -0,0 +1,7 @@ +# See sources.list(5) manpage for more information + +deb http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free +#deb-src http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free + +#deb http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free +#deb-src http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free -- cgit v1.2.3 From 3255db2d02358e0026c3e6d0d8cc1519bcd48faf Mon Sep 17 00:00:00 2001 From: Guillem Jover <guillem@debian.org> Date: Sun, 16 Feb 2014 23:29:13 +0100 Subject: ExtractTar: Allow an empty decompressor program This allows for uncompressed tar files, as the decompressor process will not get interposed in-between the file descriptors. --- apt-inst/contrib/extracttar.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 2437c9749..41301d1a6 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -111,6 +111,12 @@ bool ExtractTar::Done(bool Force) gzip will efficiently ignore the extra bits. */ bool ExtractTar::StartGzip() { + if (DecompressProg.empty()) + { + InFd.OpenDescriptor(File.Fd(), FileFd::ReadOnly, FileFd::None, false); + return true; + } + int Pipes[2]; if (pipe(Pipes) != 0) return _error->Errno("pipe",_("Failed to create pipes")); -- cgit v1.2.3 From 50b942e9a228337a2ca20931036c7cfd8cdba90d Mon Sep 17 00:00:00 2001 From: Guillem Jover <guillem@debian.org> Date: Mon, 17 Feb 2014 22:02:38 +0100 Subject: DebFile: Refactor ExtractTarMember() out from ExtractArchive() Generalize DebFile::ExtractArchive() to take a member base name, so that we can reuse it for control.tar member extraction too. --- apt-inst/deb/debfile.cc | 17 ++++++++++++----- apt-inst/deb/debfile.h | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 79434d8b5..15db1a7fc 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -88,21 +88,20 @@ const ARArchive::Member *debDebFile::GotoMember(const char *Name) return Member; } /*}}}*/ -// DebFile::ExtractArchive - Extract the archive data itself /*{{{*/ +// DebFile::ExtractTarMember - Extract the contents of a tar member /*{{{*/ // --------------------------------------------------------------------- /* Simple wrapper around tar.. */ -bool debDebFile::ExtractArchive(pkgDirStream &Stream) +bool debDebFile::ExtractTarMember(pkgDirStream &Stream,const char *Name) { // Get the archive member const ARArchive::Member *Member = NULL; std::string Compressor; - std::string const data = "data.tar"; std::vector<APT::Configuration::Compressor> compressor = APT::Configuration::getCompressors(); for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); c != compressor.end(); ++c) { - Member = AR.FindMember(std::string(data).append(c->Extension).c_str()); + Member = AR.FindMember(std::string(Name).append(c->Extension).c_str()); if (Member == NULL) continue; Compressor = c->Binary; @@ -111,7 +110,7 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream) if (Member == NULL) { - std::string ext = "data.tar.{"; + std::string ext = std::string(Name) + ".{"; for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); c != compressor.end(); ++c) ext.append(c->Extension.substr(1)); @@ -129,6 +128,14 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream) return Tar.Go(Stream); } /*}}}*/ +// DebFile::ExtractArchive - Extract the archive data itself /*{{{*/ +// --------------------------------------------------------------------- +/* Simple wrapper around DebFile::ExtractTarMember. */ +bool debDebFile::ExtractArchive(pkgDirStream &Stream) +{ + return ExtractTarMember(Stream, "data.tar"); +} + /*}}}*/ // DebFile::ControlExtract::DoItem - Control Tar Extraction /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index 38211fb0f..ecef71d21 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -48,6 +48,7 @@ class debDebFile class ControlExtract; class MemControlExtract; + bool ExtractTarMember(pkgDirStream &Stream, const char *Name); bool ExtractArchive(pkgDirStream &Stream); const ARArchive::Member *GotoMember(const char *Name); inline FileFd &GetFile() {return File;}; -- cgit v1.2.3 From e7f56293f029505f59670be2bad244f6d9912369 Mon Sep 17 00:00:00 2001 From: Guillem Jover <guillem@debian.org> Date: Sun, 16 Feb 2014 23:30:48 +0100 Subject: Add support for data.tar, control.tar and control.tar.xz Sync the deb(5) format support with latest dpkg, by allowing uncompressed tar members and xz compressed control.tar. This also refactors the control.tar member extraction by using ExtractTarMember(), which also means future changes only need to be implemented in a single place. --- apt-inst/deb/debfile.cc | 21 ++++++++++----------- cmdline/apt-extracttemplates.cc | 18 ++++-------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 15db1a7fc..a811bbe88 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -42,12 +42,15 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File) return; } - if (!CheckMember("control.tar.gz")) { - _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "control.tar.gz"); + if (!CheckMember("control.tar") && + !CheckMember("control.tar.gz") && + !CheckMember("control.tar.xz")) { + _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "control.tar"); return; } - if (!CheckMember("data.tar.gz") && + if (!CheckMember("data.tar") && + !CheckMember("data.tar.gz") && !CheckMember("data.tar.bz2") && !CheckMember("data.tar.lzma") && !CheckMember("data.tar.xz")) { @@ -108,6 +111,9 @@ bool debDebFile::ExtractTarMember(pkgDirStream &Stream,const char *Name) break; } + if (Member == NULL) + Member = AR.FindMember(std::string(Name).c_str()); + if (Member == NULL) { std::string ext = std::string(Name) + ".{"; @@ -201,14 +207,7 @@ bool debDebFile::MemControlExtract::Process(Item &Itm,const unsigned char *Data, it parses it into a tag section parser. */ bool debDebFile::MemControlExtract::Read(debDebFile &Deb) { - // Get the archive member and positition the file - const ARArchive::Member *Member = Deb.GotoMember("control.tar.gz"); - if (Member == 0) - return false; - - // Extract it. - ExtractTar Tar(Deb.GetFile(),Member->Size,"gzip"); - if (Tar.Go(*this) == false) + if (Deb.ExtractTarMember(*this, "control.tar") == false) return false; if (Control == 0) diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 8e1937113..2408a7d9d 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -24,8 +24,7 @@ #include <apt-pkg/pkgcachegen.h> #include <apt-pkg/version.h> #include <apt-pkg/tagfile.h> -#include <apt-pkg/extracttar.h> -#include <apt-pkg/arfile.h> +#include <apt-pkg/debfile.h> #include <apt-pkg/deblistparser.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> @@ -91,18 +90,9 @@ string DebFile::GetInstalledVer(const string &package) /* */ bool DebFile::Go() { - ARArchive AR(File); - if (_error->PendingError() == true) - return false; - - const ARArchive::Member *Member = AR.FindMember("control.tar.gz"); - if (Member == 0) - return _error->Error(_("%s not a valid DEB package."),File.Name().c_str()); - - if (File.Seek(Member->Start) == false) - return false; - ExtractTar Tar(File, Member->Size,"gzip"); - return Tar.Go(*this); + debDebFile Deb(File); + + return Deb.ExtractTarMember(*this, "control.tar"); } /*}}}*/ // DebFile::DoItem examine element in package and mark /*{{{*/ -- cgit v1.2.3 From 5a4924ce63a28cb546348d136d62940233f89417 Mon Sep 17 00:00:00 2001 From: Guillem Jover <guillem@debian.org> Date: Sat, 22 Feb 2014 19:24:32 +0100 Subject: debian: Add debDebFile::ExtractTarMember to the symbols file --- debian/libapt-inst1.5.symbols | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols index 030795382..35cce919f 100644 --- a/debian/libapt-inst1.5.symbols +++ b/debian/libapt-inst1.5.symbols @@ -9,6 +9,7 @@ libapt-inst.so.1.5 libapt-inst1.5 #MINVER# (c++)"debDebFile::CheckMember(char const*)@Base" 0.8.0 (c++)"debDebFile::ControlExtract::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0 (c++)"debDebFile::ControlExtract::~ControlExtract()@Base" 0.8.0 + (c++)"debDebFile::ExtractTarMember(pkgDirStream&, char const*)@Base" 0.9.15.4 (c++)"debDebFile::ExtractArchive(pkgDirStream&)@Base" 0.8.0 (c++)"debDebFile::MemControlExtract::TakeControl(void const*, unsigned long)@Base" 0.8.0 (c++)"debDebFile::MemControlExtract::Read(debDebFile&)@Base" 0.8.0 -- cgit v1.2.3 From adff049d96e27242b5784455399238df8680dceb Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 22 Feb 2014 21:07:38 +0100 Subject: add testcase for Bug#718329 --- test/integration/framework | 3 +- .../test-apt-bug-718329-support-data.tar | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100755 test/integration/test-apt-bug-718329-support-data.tar diff --git a/test/integration/framework b/test/integration/framework index 63df86df7..be2cb95d1 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -377,6 +377,7 @@ buildsimplenativepackage() { local SECTION="${7:-others}" local PRIORITY="${8:-optional}" local FILE_TREE="$9" + local COMPRESS_TYPE="${10:-gzip}" local DISTSECTION if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then DISTSECTION="main" @@ -442,7 +443,7 @@ Package: $NAME" >> ${BUILDDIR}/debian/control local LOG="${BUILDDIR}/../${NAME}_${VERSION}_${arch}.dpkg-deb.log" # ensure the right permissions as dpkg-deb ensists chmod 755 ${BUILDDIR}/debian/tmp/DEBIAN - if ! dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. >$LOG 2>&1; then + if ! dpkg-deb -Z${COMPRESS_TYPE} --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. >$LOG 2>&1; then cat $LOG false fi diff --git a/test/integration/test-apt-bug-718329-support-data.tar b/test/integration/test-apt-bug-718329-support-data.tar new file mode 100755 index 000000000..5cfb31917 --- /dev/null +++ b/test/integration/test-apt-bug-718329-support-data.tar @@ -0,0 +1,34 @@ +#!/bin/sh +set -e + +test_process_package_with_compression() { + COMPRESSOR="$1" + DATA_TAR="$2" + + msgtest "Testing apt-ftparchive with compression type: $COMPRESSOR" + + buildsimplenativepackage 'pkg' 'all' '1.0' '' '' 'some descr' '' '' '' "$COMPRESSOR" + testequal "debian-binary +control.tar.gz +$DATA_TAR" ar t incoming/pkg_1.0_all.deb + + testequal "Package: pkg" echo "$(aptftparchive packages incoming/|grep ^Package)" + + testequal "usr/bin/pkg-all pkg +usr/share/doc/pkg/FEATURES pkg +usr/share/doc/pkg/changelog pkg +usr/share/doc/pkg/copyright pkg" aptftparchive contents incoming/ + + rm -rf incoming/* +} + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +test_process_package_with_compression "gzip" "data.tar.gz" +test_process_package_with_compression "none" "data.tar" +test_process_package_with_compression "xz" "data.tar.xz" + + + -- cgit v1.2.3 From 3e5f181e51bc94fa45e9a36fb094cd3051212013 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 22 Feb 2014 22:04:22 +0100 Subject: fix ADT failure in downloadfile() --- test/integration/framework | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/integration/framework b/test/integration/framework index be2cb95d1..99214ef73 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -935,6 +935,10 @@ changetocdrom() { downloadfile() { PROTO="$(echo "$1" | cut -d':' -f 1)" + if [ ! -x "${METHODSDIR}/${PROTO}" ]; then + msgwarn "can not find ${METHODSDIR}/${PROTO}" + return 1 + fi local DOWNLOG="${TMPWORKINGDIRECTORY}/download.log" rm -f "$DOWNLOG" touch "$DOWNLOG" @@ -963,7 +967,7 @@ Filename: ${2} break fi done - } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/${PROTO} 2>&1 | tee "$DOWNLOG" + } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${METHODSDIR}/${PROTO} 2>&1 | tee "$DOWNLOG" rm "$DOWNLOG" # only if the file exists the download was successful if [ -e "$2" ]; then -- cgit v1.2.3 From 3c74988b38b9ef9326639603a9687ec0d292dfc9 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 22 Feb 2014 22:28:36 +0100 Subject: skip test if "apt" is not build --- test/integration/test-apt-cli-list | 6 ++++++ test/integration/test-apt-cli-search | 6 ++++++ test/integration/test-apt-cli-show | 6 ++++++ test/integration/test-apt-cli-upgrade | 7 +++++++ 4 files changed, 25 insertions(+) diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list index 47507aeb8..47cfb624a 100755 --- a/test/integration/test-apt-cli-list +++ b/test/integration/test-apt-cli-list @@ -7,6 +7,12 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" +if [ ! -x ${BUILDDIRECTORY}/apt ]; then + msgmsg "No ${BUILDDIRECTORY}/apt" + msgskip + exit 0 +fi + insertpackage 'unstable' 'foo' 'all' '1.0' insertinstalledpackage 'bar' 'i386' '1.0' diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search index 979aff880..84650b366 100755 --- a/test/integration/test-apt-cli-search +++ b/test/integration/test-apt-cli-search @@ -7,6 +7,12 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" +if [ ! -x ${BUILDDIRECTORY}/apt ]; then + msgmsg "No ${BUILDDIRECTORY}/apt" + msgskip + exit 0 +fi + DESCR='Some description that has a unusual word xxyyzz and aabbcc' DESCR2='Some other description with the unusual aabbcc only' insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR" diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index 91cc9a3c0..4c8e134d6 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -7,6 +7,12 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" +if [ ! -x ${BUILDDIRECTORY}/apt ]; then + msgmsg "No ${BUILDDIRECTORY}/apt" + msgskip + exit 0 +fi + DESCR='Some description That has multiple lines' insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR" diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade index 21ce69413..b6ee2270b 100755 --- a/test/integration/test-apt-cli-upgrade +++ b/test/integration/test-apt-cli-upgrade @@ -7,6 +7,13 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" +if [ ! -x ${BUILDDIRECTORY}/apt ]; then + msgmsg "No ${BUILDDIRECTORY}/apt" + msgskip + exit 0 +fi + + insertpackage 'unstable' 'foo' 'all' '2.0' 'Depends: foo-new-dependency' insertpackage 'unstable' 'foo-new-dependency' 'all' '2.0' insertinstalledpackage 'foo' 'all' '1.0' -- cgit v1.2.3 From c3d0a74a58dbcbfbb58c11e6834ead30881f5245 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sat, 22 Feb 2014 23:53:54 +0100 Subject: add missing libdb-dev to debian/tests/control --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/tests/control b/debian/tests/control index ae794f762..12490a36f 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests Restrictions: allow-stderr -Depends: @, apt, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4 +Depends: @, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev -- cgit v1.2.3 From 00f2d6c1aa60e8e5cf0e2a0db62e5e39088cb763 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sun, 23 Feb 2014 00:05:43 +0100 Subject: test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: use http-method from METHODSDIR --- test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall index 1576c396c..7112d2b45 100755 --- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall +++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall @@ -22,7 +22,7 @@ Config-Item: Acquire::http::DependOnSTDIN=0 600 Acquire URI URI: http://localhost:8080/holygrail Filename: knights-talking -' | http >/dev/null 2>&1 && msgpass || msgfail +' | ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail testfileequal knights-talking 'ni ni ni' ensure_n_canary_strings_in_dir() { -- cgit v1.2.3 From 39b73d816877098e7ccdd0a392cd02aa4c2fac04 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sun, 23 Feb 2014 00:28:26 +0100 Subject: releasing package apt version 0.9.15.4 --- configure.ac | 2 +- debian/changelog | 13 +++++++++++-- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 6 +++--- doc/po/de.po | 4 ++-- doc/po/es.po | 4 ++-- doc/po/fr.po | 4 ++-- doc/po/it.po | 4 ++-- doc/po/ja.po | 4 ++-- doc/po/pl.po | 4 ++-- doc/po/pt.po | 4 ++-- doc/po/pt_BR.po | 4 ++-- po/ar.po | 36 +++++++++++++++++------------------- po/ast.po | 36 +++++++++++++++++------------------- po/bg.po | 36 +++++++++++++++++------------------- po/bs.po | 36 +++++++++++++++++------------------- po/ca.po | 36 +++++++++++++++++------------------- po/cs.po | 36 +++++++++++++++++------------------- po/cy.po | 36 +++++++++++++++++------------------- po/da.po | 36 +++++++++++++++++------------------- po/de.po | 36 +++++++++++++++++------------------- po/dz.po | 36 +++++++++++++++++------------------- po/el.po | 36 +++++++++++++++++------------------- po/es.po | 36 +++++++++++++++++------------------- po/eu.po | 36 +++++++++++++++++------------------- po/fi.po | 36 +++++++++++++++++------------------- po/fr.po | 36 +++++++++++++++++------------------- po/gl.po | 36 +++++++++++++++++------------------- po/hu.po | 36 +++++++++++++++++------------------- po/it.po | 36 +++++++++++++++++------------------- po/ja.po | 36 +++++++++++++++++------------------- po/km.po | 36 +++++++++++++++++------------------- po/ko.po | 36 +++++++++++++++++------------------- po/ku.po | 36 +++++++++++++++++------------------- po/lt.po | 36 +++++++++++++++++------------------- po/mr.po | 36 +++++++++++++++++------------------- po/nb.po | 36 +++++++++++++++++------------------- po/ne.po | 36 +++++++++++++++++------------------- po/nl.po | 36 +++++++++++++++++------------------- po/nn.po | 36 +++++++++++++++++------------------- po/pl.po | 36 +++++++++++++++++------------------- po/pt.po | 36 +++++++++++++++++------------------- po/pt_BR.po | 36 +++++++++++++++++------------------- po/ro.po | 36 +++++++++++++++++------------------- po/ru.po | 36 +++++++++++++++++------------------- po/sk.po | 36 +++++++++++++++++------------------- po/sl.po | 36 +++++++++++++++++------------------- po/sv.po | 36 +++++++++++++++++------------------- po/th.po | 36 +++++++++++++++++------------------- po/tl.po | 36 +++++++++++++++++------------------- po/tr.po | 36 +++++++++++++++++------------------- po/uk.po | 36 +++++++++++++++++------------------- po/vi.po | 36 +++++++++++++++++------------------- po/zh_CN.po | 36 +++++++++++++++++------------------- po/zh_TW.po | 36 +++++++++++++++++------------------- 55 files changed, 763 insertions(+), 840 deletions(-) diff --git a/configure.ac b/configure.ac index 083e7c494..a697597b5 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.3" +PACKAGE_VERSION="0.9.15.4" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index eb5e079bc..a3dd9af41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,21 @@ -apt (0.9.15.4) UNRELEASED; urgency=low +apt (0.9.15.4) unstable; urgency=low [ Michael Vogt ] * remove auto-generated apt-key and sources.list on clean (closes: 739749) + * add testcase for Bug#718329 + * various fixes for ADT failures + [ Jon Severinsson ] + * add apt-vendor information for tanglu + [ Guillem Jover ] + * ExtractTar: Allow an empty decompressor program + * DebFile: Refactor ExtractTarMember() out from ExtractArchive() + * Add support for data.tar, control.tar and control.tar.xz + * debian: Add debDebFile::ExtractTarMember to the symbols file * Fix typos in documentation (codespell) - -- Michael Vogt <mvo@debian.org> Sat, 22 Feb 2014 17:58:08 +0100 + -- Michael Vogt <mvo@debian.org> Sun, 23 Feb 2014 00:27:12 +0100 apt (0.9.15.3) unstable; urgency=medium diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index d191c08fa..b9e6a881a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15.3"> +<!ENTITY apt-product-version "0.9.15.4"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 8e63cdfc0..348980dd7 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.15.2\n" +"Project-Id-Version: apt-doc 0.9.15.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -6183,7 +6183,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/de.po b/doc/po/de.po index 5afea89ca..b7d84acc1 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -8780,7 +8780,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/es.po b/doc/po/es.po index 5c49f7485..bcf0ccf51 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -8792,7 +8792,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/fr.po b/doc/po/fr.po index 09b70a66f..2ae614b56 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -8753,7 +8753,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/it.po b/doc/po/it.po index 30bbf8b11..1050cee57 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -8766,7 +8766,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index 7fd447ef9..99c2ea2c3 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -8336,7 +8336,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index 5b6463102..dda23a5d3 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -7996,7 +7996,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index c4668f2ee..99adcbaff 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -8700,7 +8700,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 1e75023f1..c1014fbb0 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-20 14:42+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -6598,7 +6598,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/po/ar.po b/po/ar.po index e1691f84d..3b98d34fc 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -162,7 +162,7 @@ msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1585,12 +1585,7 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها msgid "Merging available information" msgstr "دمج المعلومات المتوفرة" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ليس حزمة DEB صالحة." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1604,12 +1599,12 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" @@ -1921,23 +1916,23 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "فشل تنفيذ gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "أرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -2060,18 +2055,18 @@ msgstr "" msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "خطأ داخلي، تعذر العثور على العضو %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "" @@ -3268,6 +3263,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ليس حزمة DEB صالحة." + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" diff --git a/po/ast.po b/po/ast.po index 716e1b0d9..f10324701 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -155,7 +155,7 @@ msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1715,12 +1715,7 @@ msgstr "" msgid "Merging available information" msgstr "Fusionando información disponible" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s nun ye un paquete DEB válidu." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1745,12 +1740,12 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nun se pue escribir en %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?" @@ -2126,23 +2121,23 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n" "cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Fallu al crear les tuberíes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Fallu al executar gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Ficheru tollíu" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Falló la suma de control de tar, ficheru tollíu" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Testera del TAR triba %u desconocida, miembru %s" @@ -2265,18 +2260,18 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" msgid "Unable to stat %s" msgstr "Nun ye a lleer %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error internu, nun se pue atopar el miembru %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Ficheru de control inanalizable" @@ -3528,6 +3523,9 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiáu" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s nun ye un paquete DEB válidu." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/bg.po b/po/bg.po index d05603db6..9bc639d8c 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -161,7 +161,7 @@ msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1747,12 +1747,7 @@ msgstr "" msgid "Merging available information" msgstr "Смесване на наличната информация" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s не е валиден DEB пакет." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1778,12 +1773,12 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" @@ -2161,23 +2156,23 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Неуспех при създаването на програмни канали" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Неуспех при изпълнението на gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Развален архив" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Невярна контролна сума на tar, развален архив" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Непозната заглавна част на TAR тип %u, елемент %s" @@ -2300,18 +2295,18 @@ msgstr "Файл %s/%s заменя този в пакет %s" msgid "Unable to stat %s" msgstr "Неуспех при получаването на атрибути за %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Това не е валиден DEB архив, липсва елемент „%s“" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Контролен файл, невъзможен за анализ" @@ -3586,6 +3581,9 @@ msgstr "" msgid "Not locked" msgstr "Без заключване" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s не е валиден DEB пакет." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/bs.po b/po/bs.po index 510d0b56b..b5d611697 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -157,7 +157,7 @@ msgstr "" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1578,12 +1578,7 @@ msgstr "" msgid "Merging available information" msgstr "Sastavljam dostupne informacije" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s nije ispravan DEB paket." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1597,12 +1592,12 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" @@ -1915,23 +1910,23 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Ne mogu izvršiti gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Oštećena arhiva" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -2054,18 +2049,18 @@ msgstr "" msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "" @@ -3261,6 +3256,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s nije ispravan DEB paket." + #, fuzzy #~ msgid " [Not candidate version]" #~ msgstr "Verzije kandidata" diff --git a/po/ca.po b/po/ca.po index 427ec8de9..6ca12fcf0 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -159,7 +159,7 @@ msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1737,12 +1737,7 @@ msgstr "" msgid "Merging available information" msgstr "S'està fusionant la informació disponible" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s no és un paquet DEB vàlid." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1766,12 +1761,12 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?" @@ -2145,23 +2140,23 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "No es poden crear els conductes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Arxiu corromput" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" @@ -2284,18 +2279,18 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" msgid "Unable to stat %s" msgstr "No es pot veure l'estat de %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error intern, no s'ha pogut localitzar al membre %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "El fitxer de control no es pot analitzar" @@ -3569,6 +3564,9 @@ msgstr "" msgid "Not locked" msgstr "No blocat" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s no és un paquet DEB vàlid." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/cs.po b/po/cs.po index b16a65afc..d3442e87f 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -156,7 +156,7 @@ msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1722,12 +1722,7 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova msgid "Merging available information" msgstr "Slučuji dostupné informace" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s není platný DEB balík." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1750,12 +1745,12 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nelze zapsat do %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?" @@ -2127,23 +2122,23 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Selhalo vytvoření roury" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Selhalo spuštění gzipu " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Porušený archiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolní součet taru selhal, archiv je poškozený" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznámá hlavička TARu typ %u, člen %s" @@ -2266,18 +2261,18 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s" msgid "Unable to stat %s" msgstr "Nelze vyhodnotit %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Toto není platný DEB archiv, chybí část „%s“" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vnitřní chyba, nemohu najít část %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Nezpracovatelný kontrolní soubor" @@ -3514,6 +3509,9 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „% msgid "Not locked" msgstr "Není uzamčen" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s není platný DEB balík." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/cy.po b/po/cy.po index cfe41d071..7920dbb9a 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -175,7 +175,7 @@ msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1741,13 +1741,8 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "Nid yw %s yn becyn DEB dilys." - # FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 #, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" @@ -1772,12 +1767,12 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" @@ -2155,24 +2150,24 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -2299,18 +2294,18 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, fuzzy, c-format msgid "Internal error, could not locate member %s" msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 #, fuzzy msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" @@ -3558,6 +3553,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "Nid yw %s yn becyn DEB dilys." + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" diff --git a/po/da.po b/po/da.po index 4d0f6876d..05b80b394 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -162,7 +162,7 @@ msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1752,12 +1752,7 @@ msgstr "" msgid "Merging available information" msgstr "Sammenfletter tilgængelighedsoplysninger" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s er ikke en gyldig DEB-pakke." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1781,12 +1776,12 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke finde debconfs version. Er debconf installeret?" @@ -2160,23 +2155,23 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Kunne ikke oprette videreførsler" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Kunne ikke udføre gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-tjeksum fejlede, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukendt TAR-hovedtype %u, element %s" @@ -2299,18 +2294,18 @@ msgstr "File %s/%s overskriver filen i pakken %s" msgid "Unable to stat %s" msgstr "Kunne ikke finde %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern fejl, kunne ikke finde elementet %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Ikke-tolkbar kontrolfil" @@ -3548,6 +3543,9 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet." msgid "Not locked" msgstr "Ikke låst" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s er ikke en gyldig DEB-pakke." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/de.po b/po/de.po index 5a01fdc46..b097e830e 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -163,7 +163,7 @@ msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1783,12 +1783,7 @@ msgstr "" msgid "Merging available information" msgstr "Verfügbare Informationen werden zusammengeführt." -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ist kein gültiges DEB-Paket." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1812,12 +1807,12 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Schreiben nach %s nicht möglich" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" @@ -2200,23 +2195,23 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden." -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "gzip konnte nicht ausgeführt werden." -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Beschädigtes Archiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s" @@ -2339,18 +2334,18 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben." msgid "Unable to stat %s" msgstr "%s mit »stat« abfragen nicht möglich" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält." -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Auswerten der »control«-Datei nicht möglich" @@ -3642,6 +3637,9 @@ msgstr "" msgid "Not locked" msgstr "Nicht gesperrt" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ist kein gültiges DEB-Paket." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/dz.po b/po/dz.po index 33fb41b1a..2880a849f 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -163,7 +163,7 @@ msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1703,12 +1703,7 @@ msgstr "" msgid "Merging available information" msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པས།" - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1732,12 +1727,12 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?" @@ -2117,23 +2112,23 @@ msgstr "" " -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།" @@ -2256,18 +2251,18 @@ msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་ས msgid "Unable to stat %s" msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།" @@ -3484,6 +3479,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པས།" + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/el.po b/po/el.po index 7de89c394..923d455ca 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -168,7 +168,7 @@ msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1723,12 +1723,7 @@ msgstr "" msgid "Merging available information" msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "Το %s δεν είναι έγκυρο πακέτο DEB." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1752,12 +1747,12 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" @@ -2136,23 +2131,23 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Αποτυχία κατά την εκτέλεση του gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Κατεστραμμένη αρχειοθήκη" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" @@ -2275,18 +2270,18 @@ msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέ msgid "Unable to stat %s" msgstr "Αδύνατη η εύρεση της κατάστασης του %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Μη αναλύσιμο αρχείο control" @@ -3513,6 +3508,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "Το %s δεν είναι έγκυρο πακέτο DEB." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/es.po b/po/es.po index df53d6c2d..6848f4678 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -213,7 +213,7 @@ msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1789,12 +1789,7 @@ msgstr "" msgid "Merging available information" msgstr "Fusionando información disponible" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s no es un paquete DEB válido." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1819,12 +1814,12 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?" @@ -2204,24 +2199,24 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n" "cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "No pude crear las tuberías" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "No pude ejecutar gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Archivo dañado" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "" "Se produjo un fallo al calcular la suma de control de tar, archive dañado" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Cabecera del TAR tipo %u desconocida, miembro %s" @@ -2344,18 +2339,18 @@ msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s" msgid "Unable to stat %s" msgstr "No pude leer %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este no es un archivo DEB válido, falta el miembro «%s»" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error interno, no pude localizar el miembro %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Archivo de control inanalizable" @@ -3630,6 +3625,9 @@ msgstr "" msgid "Not locked" msgstr "No bloqueado" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s no es un paquete DEB válido." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/eu.po b/po/eu.po index 3f1fd165a..48efb2b53 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -161,7 +161,7 @@ msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1709,12 +1709,7 @@ msgstr "" msgid "Merging available information" msgstr "Eskuragarrien datuak biltzen" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ez da baliozko DEB pakete bat." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1738,12 +1733,12 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" @@ -2116,23 +2111,23 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Huts egin du kanalizazioak sortzean" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Huts egin du gzip exekutatzean " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Hondatutako artxiboa" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "%u TAR goiburu mota ezezaguna, %s kidea" @@ -2255,18 +2250,18 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" msgid "Unable to stat %s" msgstr "Ezin da daturik lortu %s(e)tik" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Barne Errorea, ezin da %s atala kokatu" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Kontrol fitxategi ezin analizagarria" @@ -3483,6 +3478,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ez da baliozko DEB pakete bat." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/fi.po b/po/fi.po index 96e3f9f8f..b12d26f5c 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -159,7 +159,7 @@ msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1702,12 +1702,7 @@ msgstr "" msgid "Merging available information" msgstr "Yhdistetään saatavuustiedot" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ei kelpaa DEB-paketiksi." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1731,12 +1726,12 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" @@ -2113,23 +2108,23 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Putkien luonti ei onnistunut" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "exec gzip ei onnistunut" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" @@ -2252,18 +2247,18 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" msgid "Unable to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\"" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Ohjaustiedosto ei jäsenny" @@ -3475,6 +3470,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ei kelpaa DEB-paketiksi." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/fr.po b/po/fr.po index c9c34758f..9aee2236c 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -158,7 +158,7 @@ msgstr " Table de version :" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1792,12 +1792,7 @@ msgstr "" msgid "Merging available information" msgstr "Fusion des informations disponibles" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s n'est pas un paquet Debian valide." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1821,12 +1816,12 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'écrire sur %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" @@ -2207,23 +2202,23 @@ msgstr "" " -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Échec de création de tubes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Impossible d'exécuter gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Type d'en-tête %u inconnu pour TAR, partie %s" @@ -2346,18 +2341,18 @@ msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" msgid "Unable to stat %s" msgstr "Impossible de statuer pour %s." -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erreur interne, ne peut localiser la partie %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Fichier de contrôle non traitable" @@ -3663,6 +3658,9 @@ msgstr "" msgid "Not locked" msgstr "Non verrouillé" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s n'est pas un paquet Debian valide." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/gl.po b/po/gl.po index 66226393f..25e24dbcf 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -163,7 +163,7 @@ msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1737,12 +1737,7 @@ msgstr "" msgid "Merging available information" msgstr "Mesturando a información sobre paquetes dispoñíbeis" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s non é un paquete DEB válido." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1767,12 +1762,12 @@ msgstr "" " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Non é posíbel escribir en %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?" @@ -2150,23 +2145,23 @@ msgstr "" " -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Non foi posíbel crear as canles" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Non foi posíbel executar gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Arquivo danado" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "A suma de comprobación do arquivo tar non coincide, está danado" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" @@ -2289,18 +2284,18 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" msgid "Unable to stat %s" msgstr "Non é posíbel determinar o estado %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Ficheiro de control non analizábel" @@ -3573,6 +3568,9 @@ msgstr "" msgid "Not locked" msgstr "Non está bloqueado" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s non é un paquete DEB válido." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/hu.po b/po/hu.po index a4e9c1986..d15ab8b6b 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -161,7 +161,7 @@ msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1741,12 +1741,7 @@ msgstr "előtti hibák fontosak. Javítsa azokat, és futtassa az [I]nstallt új msgid "Merging available information" msgstr "Elérhető információk egyesítése" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s nem egy érvényes DEB csomag." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1771,12 +1766,12 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" @@ -2152,23 +2147,23 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Nem sikerült adatcsatornákat létrehozni" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Nem sikerült a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Hibás archívum" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag" @@ -2291,18 +2286,18 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" msgid "Unable to stat %s" msgstr "%s nem érhető el" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Belső hiba, %s tag nem található" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Értelmezhetetlen control fájl" @@ -3568,6 +3563,9 @@ msgstr "" msgid "Not locked" msgstr "Nincs zárolva" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s nem egy érvényes DEB csomag." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/it.po b/po/it.po index f14683c9c..29c18c158 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -161,7 +161,7 @@ msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1776,12 +1776,7 @@ msgstr "" msgid "Merging available information" msgstr "Unione delle informazioni disponibili" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s non è un pacchetto DEB valido." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1805,12 +1800,12 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Impossibile trovare la versione di debconf. È installato?" @@ -2186,23 +2181,23 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Creazione delle pipe non riuscita" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Esecuzione di gzip non riuscita " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Archivio danneggiato" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum di tar non riuscito, archivio danneggiato" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Intestazione TAR di tipo %u sconosciuta, member %s" @@ -2326,18 +2321,18 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" msgid "Unable to stat %s" msgstr "Impossibile eseguire stat su %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Errore interno, impossibile trovare il membro %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "File \"control\" non analizzabile" @@ -3636,6 +3631,9 @@ msgstr "" msgid "Not locked" msgstr "Non bloccato" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s non è un pacchetto DEB valido." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/ja.po b/po/ja.po index 8000cda34..517265903 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -158,7 +158,7 @@ msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1737,12 +1737,7 @@ msgstr "が重要です。これを修正して「導入」を再度実行して msgid "Merging available information" msgstr "入手可能情報をマージしています" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s は正しい DEB パッケージではありません。" - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1766,12 +1761,12 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "debconf のバージョンを取得できません。debconf はインストールされていますか?" @@ -2145,23 +2140,23 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "パイプの生成に失敗しました" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "gzip の実行に失敗しました" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "壊れたアーカイブ" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" @@ -2285,18 +2280,18 @@ msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" msgid "Unable to stat %s" msgstr "%s の状態を取得できません" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部エラー、メンバー %s を特定できません" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "解析できないコントロールファイル" @@ -3560,6 +3555,9 @@ msgstr "" msgid "Not locked" msgstr "ロックされていません" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s は正しい DEB パッケージではありません。" + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/km.po b/po/km.po index 76940e49c..321a989c3 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -163,7 +163,7 @@ msgstr " តារាង​កំណែ ៖" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1681,12 +1681,7 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន msgid "Merging available information" msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB ត្រឹមត្រូវ​ទេ​ ។" - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1710,12 +1705,12 @@ msgstr "" " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "មិន​អាច​សរសេរ​ទៅ %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?" @@ -2090,23 +2085,23 @@ msgstr "" " -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "ប័ណ្ណសារ​បាន​ខូច​" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s" @@ -2229,18 +2224,18 @@ msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​ msgid "Unable to stat %s" msgstr "មិន​អាច​ថ្លែង %s បានឡើយ" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន" @@ -3448,6 +3443,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB ត្រឹមត្រូវ​ទេ​ ។" + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/ko.po b/po/ko.po index 02d0e2fc9..dd6b90dd6 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -154,7 +154,7 @@ msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1695,12 +1695,7 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 msgid "Merging available information" msgstr "이용 가능 패키지 정보를 합칩니다" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s은(는) 올바른 DEB 패키지가 아닙니다." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1724,12 +1719,12 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" @@ -2106,23 +2101,23 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "파이프 만들기가 실패했습니다" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "gzip 실행이 실패했습니다" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s" @@ -2245,18 +2240,18 @@ msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다" msgid "Unable to stat %s" msgstr "%s의 정보를 읽을 수 없습니다" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "내부 오류, %s 멤버를 찾을 수 없습니다" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "control 파일을 파싱할 수 없습니다" @@ -3482,6 +3477,9 @@ msgstr "" msgid "Not locked" msgstr "잠기지 않음" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s은(는) 올바른 DEB 패키지가 아닙니다." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/ku.po b/po/ku.po index 6f8ca5971..55d6f7765 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -162,7 +162,7 @@ msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1583,12 +1583,7 @@ msgstr "" msgid "Merging available information" msgstr "" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ne paketeke DEB ya derbasdar e." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1602,12 +1597,12 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" @@ -1932,24 +1927,24 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 #, fuzzy msgid "Failed to create pipes" msgstr "%s ji hev nehate veçirandin" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Xebitandina gzip biserneket" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -2074,18 +2069,18 @@ msgstr "" msgid "Unable to stat %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "" @@ -3278,6 +3273,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ne paketeke DEB ya derbasdar e." + #, fuzzy #~ msgid " [Not candidate version]" #~ msgstr "Guhartoyên berendam" diff --git a/po/lt.po b/po/lt.po index 11eb43021..f707ff448 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -160,7 +160,7 @@ msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1607,12 +1607,7 @@ msgstr "" msgid "Merging available information" msgstr "Sujungiama turima informaija" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s nėra tikras DEB paketas." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1637,12 +1632,12 @@ msgstr "" " -c=? Nuskaityti šį konfigūracijų failą\n" " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nepavyko įrašyti į %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?" @@ -2024,23 +2019,23 @@ msgstr "" " -c=? Nuskaityti šią konfigūracijos bylą\n" " -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Sugadintas archyvas" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nežinomas TAR antraštės tipas %u. narys %s" @@ -2163,18 +2158,18 @@ msgstr "" msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vidinė klaida, nepavyko aptikti nario %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "" @@ -3373,6 +3368,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s nėra tikras DEB paketas." + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n" diff --git a/po/mr.po b/po/mr.po index 72d2bf5b2..2b4d3103f 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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 " @@ -157,7 +157,7 @@ msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1686,12 +1686,7 @@ msgstr "" msgid "Merging available information" msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s हे वैध डीईबी पॅकेज नाही " - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1715,12 +1710,12 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?" @@ -2096,23 +2091,23 @@ msgstr "" " -c=? ही संरचना फाईल वाचा\n" " -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "पाईप तयार करण्यास असमर्थ" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "exec gzip करण्यास असमर्थ" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "बिघडलेली अर्काईव्हज" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s" @@ -2235,18 +2230,18 @@ msgstr "File %s/%s, %s पॅकेज मधल्या एका वर प msgid "Unable to stat %s" msgstr "%s स्टॅट करण्यास असमर्थ" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "अनपार्सेबल नियंत्रण फाईल" @@ -3460,6 +3455,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s हे वैध डीईबी पॅकेज नाही " + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/nb.po b/po/nb.po index cbd14b77c..ed0c7b9fe 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -162,7 +162,7 @@ msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1711,12 +1711,7 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen." msgid "Merging available information" msgstr "Fletter tilgjengelig informasjon" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s er ikke en gyldig debianpakke." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1741,12 +1736,12 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?" @@ -2122,23 +2117,23 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Klarte ikke å opprette rør" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Klarte ikke å kjøre gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" @@ -2261,18 +2256,18 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" msgid "Unable to stat %s" msgstr "Klarte ikke å få statusen på %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern feil, fant ikke medlemmet %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Kontrollfila kan ikke tolkes" @@ -3510,6 +3505,9 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet," msgid "Not locked" msgstr "Ikke låst" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s er ikke en gyldig debianpakke." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/ne.po b/po/ne.po index b5aa74499..1779c9f4a 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -160,7 +160,7 @@ msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1684,12 +1684,7 @@ msgstr "" msgid "Merging available information" msgstr "उपलब्ध सूचना गाँभिदैछ" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s वैध DEB प्याकेज होइन" - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1713,12 +1708,12 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? " @@ -2092,23 +2087,23 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "पाइपहरू सिर्जना गर्न असफल" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "gzip कार्यन्वयन गर्न असफल" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s" @@ -2231,18 +2226,18 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा msgid "Unable to stat %s" msgstr "%s स्थिर गर्न असक्षम भयो" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल" @@ -3451,6 +3446,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s वैध DEB प्याकेज होइन" + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/nl.po b/po/nl.po index e24f6d2d6..dd7fe40f3 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -160,7 +160,7 @@ msgstr " Versietabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1735,12 +1735,7 @@ msgstr "" msgid "Merging available information" msgstr "De beschikbare informatie wordt samengevoegd" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s is geen geldig DEB-pakket." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1765,12 +1760,12 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" @@ -2148,23 +2143,23 @@ msgstr "" " -c=? Lees dit configuratiebestand\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Aanmaken pijp is mislukt" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Uitvoeren van gzip is mislukt " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Beschadigd archief" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s" @@ -2287,18 +2282,18 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" msgid "Unable to stat %s" msgstr "Kan de status van %s niet opvragen" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Interne fout, kon onderdeel %s niet vinden" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Niet-ontleedbaar 'control'-bestand" @@ -3569,6 +3564,9 @@ msgstr "" msgid "Not locked" msgstr "Niet vergrendeld" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s is geen geldig DEB-pakket." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/nn.po b/po/nn.po index 6061ad8ba..29b8b6f60 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -162,7 +162,7 @@ msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1693,12 +1693,7 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p msgid "Merging available information" msgstr "Flettar informasjon om tilgjengelege pakkar" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s er ingen gyldig DEB-pakke." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1722,12 +1717,12 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" @@ -2098,23 +2093,23 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Klarte ikkje oppretta ryr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Klarte ikkje kyra gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "ydelagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjend TAR-hovud type %u, medlem %s" @@ -2237,18 +2232,18 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" msgid "Unable to stat %s" msgstr "Klarte ikkje f status til %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern feil, fann ikkje medlemmen %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Kontrollfila kan ikkje tolkast" @@ -3464,6 +3459,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s er ingen gyldig DEB-pakke." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/pl.po b/po/pl.po index 91713a4ef..b2c1e3658 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -164,7 +164,7 @@ msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1775,12 +1775,7 @@ msgstr "" msgid "Merging available information" msgstr "Łączenie informacji o dostępnych pakietach" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s nie jest prawidłowym pakietem DEB." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1804,12 +1799,12 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?" @@ -2185,23 +2180,23 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Nie udało się utworzyć potoków" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Nie udało się uruchomić programu gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Uszkodzone archiwum" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nieznany typ nagłówka TAR %u, składnik %s" @@ -2324,18 +2319,18 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" msgid "Unable to stat %s" msgstr "Nie można wykonać operacji stat na %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\"" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany" @@ -3601,6 +3596,9 @@ msgstr "" msgid "Not locked" msgstr "Niezablokowany" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s nie jest prawidłowym pakietem DEB." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/pt.po b/po/pt.po index 0f22de44a..2007af808 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -160,7 +160,7 @@ msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1748,12 +1748,7 @@ msgstr "" msgid "Merging available information" msgstr "A juntar a informação disponível" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s não é um pacote DEB válido." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1778,12 +1773,12 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Não conseguiu escrever para %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não pode obter a versão do debconf. O debconf está instalado?" @@ -2157,23 +2152,23 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Falhou a criação de pipes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Falhou executar gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "A soma de controlo do tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" @@ -2296,18 +2291,18 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s" msgid "Unable to stat %s" msgstr "Não foi possível fazer stat %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este não é um arquivo DEB válido, falta o membro '%s'" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erro Interno, não foi possível localizar o membro %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Ficheiro de controle não interpretável" @@ -3590,6 +3585,9 @@ msgstr "" msgid "Not locked" msgstr "Sem acesso exclusivo" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s não é um pacote DEB válido." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7b426300b..746f78de6 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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." @@ -160,7 +160,7 @@ msgstr " Tabela de versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1722,12 +1722,7 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente" msgid "Merging available information" msgstr "Mesclando informação disponível" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s não é um pacote DEB válido." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1752,12 +1747,12 @@ msgstr "" " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" @@ -2135,23 +2130,23 @@ msgstr "" " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Falhou ao criar \"pipes\"" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Falhou ao executar gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" @@ -2274,18 +2269,18 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s" msgid "Unable to stat %s" msgstr "Impossível executar \"stat\" em %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erro interno, não foi possível localizar membro %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Arquivo de controle não interpretável" @@ -3516,6 +3511,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s não é um pacote DEB válido." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/ro.po b/po/ro.po index 61dd8261a..2b9872364 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -161,7 +161,7 @@ msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1725,12 +1725,7 @@ msgstr "" msgid "Merging available information" msgstr "Se combină informațiile disponibile" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s nu este un pachet DEB valid." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1754,12 +1749,12 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nu s-a putut scrie în %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?" @@ -2142,24 +2137,24 @@ msgstr "" " -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Eșec la crearea conexiunilor" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Eșec la executarea lui gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "" "Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tip antet TAR %u necunoscut, membrul %s" @@ -2284,18 +2279,18 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" msgid "Unable to stat %s" msgstr "Nu se poate executa „stat” pe %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Eroare internă, nu pot localiza membrul %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Fișier de control neanalizabil" @@ -3522,6 +3517,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s nu este un pachet DEB valid." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/ru.po b/po/ru.po index ed55c8c1a..e0654f524 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -165,7 +165,7 @@ msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1768,12 +1768,7 @@ msgstr "" msgid "Merging available information" msgstr "Слияние доступной информации" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s не является правильным DEB-пакетом." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1796,12 +1791,12 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Невозможно определить версию debconf. Он установлен?" @@ -2182,23 +2177,23 @@ msgstr "" " -c=? читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Не удалось создать каналы" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Не удалось выполнить gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Повреждённый архив" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Неправильная контрольная сумма Tar, архив повреждён" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" @@ -2321,18 +2316,18 @@ msgstr "Файл %s/%s переписывает файл в пакете %s" msgid "Unable to stat %s" msgstr "Невозможно получить атрибуты %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Это неправильный DEB-архив — отсутствует составная часть «%s»" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Внутренняя ошибка, не удалось найти составную часть %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Не удалось прочесть содержимое control-файла" @@ -3604,6 +3599,9 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s не является правильным DEB-пакетом." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/sk.po b/po/sk.po index 5741a6372..aeccfe524 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -161,7 +161,7 @@ msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1740,12 +1740,7 @@ msgstr "" msgid "Merging available information" msgstr "Zlučujú sa dostupné informácie" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s nie je platný balík DEB." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1769,12 +1764,12 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovať" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?" @@ -2146,23 +2141,23 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Vytvorenie rúry zlyhalo" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Spustenie gzip zlyhalo " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Porušený archív" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznáma TAR hlavička typu %u, člen %s" @@ -2285,18 +2280,18 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s" msgid "Unable to stat %s" msgstr "Nedá sa vyhodnotiť %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Toto nie je platný DEB archív, chýba časť „%s“" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vnútorná chyba, nedá sa nájsť časť %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Nespracovateľný riadiaci súbor" @@ -3538,6 +3533,9 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s msgid "Not locked" msgstr "Nie je zamknuté" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s nie je platný balík DEB." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/sl.po b/po/sl.po index 108aedad2..721aae6d2 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -159,7 +159,7 @@ msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1741,12 +1741,7 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat" msgid "Merging available information" msgstr "Združevanje razpoložljivih podaktov" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ni veljaven paket DEB." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1770,12 +1765,12 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoče pisati na %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?" @@ -2149,23 +2144,23 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Ni mogoče ustvariti pip" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Ni mogoče izvesti gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Pokvarjen arhiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznana vrsta glave TAR %u, član %s" @@ -2288,18 +2283,18 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" msgid "Unable to stat %s" msgstr "Ni mogoče določiti %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "To ni veljaven arhiv DEB. Manjka član '%s'." -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Notranja napaka. Ni mogoče najti člana %s." -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Nadzorne datoteke ni mogoče razčleniti" @@ -3546,6 +3541,9 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. " msgid "Not locked" msgstr "Ni zaklenjeno" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ni veljaven paket DEB." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/sv.po b/po/sv.po index c9b9daa1f..7a0beb545 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -159,7 +159,7 @@ msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1730,12 +1730,7 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig msgid "Merging available information" msgstr "Sammanfogar tillgänglig information" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s är inte ett giltigt DEB-paket." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1759,12 +1754,12 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?" @@ -2144,23 +2139,23 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Misslyckades med att skapa rör" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Misslyckades med att köra gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Skadat arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Okänd TAR-rubriktyp %u, del %s" @@ -2283,18 +2278,18 @@ msgstr "Filen %s/%s skriver över den i paketet %s" msgid "Unable to stat %s" msgstr "Kunde inte ta status på %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Internt fel, kunde inta hitta delen %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Kunde inte tolka control-filen" @@ -3544,6 +3539,9 @@ msgstr "" msgid "Not locked" msgstr "Inte låst" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s är inte ett giltigt DEB-paket." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/th.po b/po/th.po index c28099bee..3129e2686 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -157,7 +157,7 @@ msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1692,12 +1692,7 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ msgid "Merging available information" msgstr "กำลังผสานรายชื่อของแพกเกจที่มี" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ไม่ใช่แพกเกจ DEB ที่ใช้การได้" - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1721,12 +1716,12 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?" @@ -2094,23 +2089,23 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "สร้างไปป์ไม่สำเร็จ" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "เรียก gzip ไม่สำเร็จ" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "แฟ้มจัดเก็บเสียหาย" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s" @@ -2233,18 +2228,18 @@ msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพก msgid "Unable to stat %s" msgstr "ไม่สามารถ stat %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "ไม่สามารถแจงแฟ้มควบคุมได้" @@ -3457,6 +3452,9 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี msgid "Not locked" msgstr "ไม่ได้ล็อคอยู่" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ไม่ใช่แพกเกจ DEB ที่ใช้การได้" + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/tl.po b/po/tl.po index 522742b9a..74ca8ec38 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -163,7 +163,7 @@ msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1708,12 +1708,7 @@ msgstr "" msgid "Merging available information" msgstr "Pinagsasama ang magagamit na impormasyon" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s ay hindi balido na paketeng DEB." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1737,12 +1732,12 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" @@ -2122,23 +2117,23 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Bigo sa paglikha ng mga pipe" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Bigo sa pagtakbo ng gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Sirang arkibo" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Bigo ang checksum ng tar, sira ang arkibo" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" @@ -2261,18 +2256,18 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" msgid "Unable to stat %s" msgstr "Hindi ma-stat ang %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Internal error, hindi mahanap ang miyembrong %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Di maintindihang talaksang control" @@ -3504,6 +3499,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s ay hindi balido na paketeng DEB." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/tr.po b/po/tr.po index f11eee943..10de5a852 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -161,7 +161,7 @@ msgstr " Sürüm çizelgesi:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1740,12 +1740,7 @@ msgstr "" msgid "Merging available information" msgstr "Kullanılabilir bilgiler birleştiriliyor" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s geçerli bir DEB paketi değil." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1769,12 +1764,12 @@ msgstr "" " -c=? Belirtilen ayar dosyasını kullanır\n" " -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s dosyasına yazılamıyor" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf sürümü alınamıyor. debconf kurulu mu?" @@ -2151,23 +2146,23 @@ msgstr "" " -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Boru oluşturulamadı" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Gzip çalıştırılamadı " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Bozuk arşiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Bilinmeyen TAR başlığı türü %u, üye %s" @@ -2290,18 +2285,18 @@ msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak isti msgid "Unable to stat %s" msgstr "%s durum bilgisi alınamadı" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "İç hata, %s üyesi bulunamadı" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Ayrıştırılamayan 'control' dosyası" @@ -3562,6 +3557,9 @@ msgstr "" msgid "Not locked" msgstr "Kilitlenmemiş" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s geçerli bir DEB paketi değil." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/uk.po b/po/uk.po index 080d76fd2..957743d91 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -166,7 +166,7 @@ msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1761,12 +1761,7 @@ msgstr "" msgid "Merging available information" msgstr "Об'єднання доступної інформації" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s не є правильним DEB пакунком." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1790,12 +1785,12 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Неможливо визначити версію debconf. Він встановлений?" @@ -2180,23 +2175,23 @@ msgstr "" " -c=? читати зазначений файл конфігурації\n" " -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Не вдалося створити канали (pipes)" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Не вдалося виконати gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Пошкоджений архів" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Контрольна сума tar архіва невірна, архів пошкоджений" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Невідомий тип заголовку TAR - %u, член %s" @@ -2323,18 +2318,18 @@ msgstr "Файл %s/%s перезаписує інший файл в пакун msgid "Unable to stat %s" msgstr "Неможливо прочитати атрибути %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Невірний DEB архів, відсутній член '%s'" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Внутрішня помилка, не можу знайти складову частину %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Контрольний файл не можливо обробити" @@ -3599,6 +3594,9 @@ msgstr "" msgid "Not locked" msgstr "Не заблоковано" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s не є правильним DEB пакунком." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/vi.po b/po/vi.po index ab7e05732..f7477fd12 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -163,7 +163,7 @@ msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1770,12 +1770,7 @@ msgstr "" msgid "Merging available information" msgstr "Đang hòa trộn các thông tin sẵn có..." -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s không phải là một gói DEB hợp lệ." - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1803,12 +1798,12 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" @@ -2199,23 +2194,23 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Việc thực hiện gzip bị lỗi " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" @@ -2338,18 +2333,18 @@ msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" msgid "Unable to stat %s" msgstr "Không thể lấy thông tin thống kê %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "Tập tin điều khiển không có khả năng phân tách" @@ -3611,6 +3606,9 @@ msgstr "" msgid "Not locked" msgstr "Chưa được khoá" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s không phải là một gói DEB hợp lệ." + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index df90ae0a4..5df69c4ee 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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" @@ -158,7 +158,7 @@ msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1676,12 +1676,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们， msgid "Merging available information" msgstr "正在合并可用信息" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s 不是一个有效的 DEB 软件包。" - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1705,12 +1700,12 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" @@ -2082,23 +2077,23 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar 的校验和不符，文件已损坏" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" @@ -2221,18 +2216,18 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" msgid "Unable to stat %s" msgstr "无法读取 %s 的状态" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部错误，无法定位包内文件 %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "不能解析的主控文件" @@ -3445,6 +3440,9 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。" msgid "Not locked" msgstr "未锁定" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s 不是一个有效的 DEB 软件包。" + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5e8a357da..1c88254ff 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-20 14:43+0100\n" +"POT-Creation-Date: 2014-02-23 00:29+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." @@ -159,7 +159,7 @@ msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1676,12 +1676,7 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]" msgid "Merging available information" msgstr "整合現有的資料" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s 並不是正確的 DEB 套件。" - -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1705,12 +1700,12 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "無法寫入 %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "無法取得 debconf 版本。是否有安裝 debconf？" @@ -2080,23 +2075,23 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "無法建立管線" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "無法執行 gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "損毀的套件檔" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum 失敗，套件檔已損毀" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 標頭類型 %u，成員 %s" @@ -2219,18 +2214,18 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案" msgid "Unable to stat %s" msgstr "無法取得 %s 的狀態" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員" -#: apt-inst/deb/debfile.cc:119 +#: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" msgstr "內部錯誤，找不找到成員 %s" -#: apt-inst/deb/debfile.cc:213 +#: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" msgstr "無法分析的 control 檔" @@ -3433,6 +3428,9 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "%s 並不是正確的 DEB 套件。" + #~ msgid "" #~ "Using CD-ROM mount point %s\n" #~ "Mounting CD-ROM\n" -- cgit v1.2.3 From b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Sun, 23 Feb 2014 00:41:52 +0100 Subject: vendor/tanglu/makefile: add missing clean/sources.list --- vendor/tanglu/makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vendor/tanglu/makefile b/vendor/tanglu/makefile index 175db1a8c..9fe680bc6 100644 --- a/vendor/tanglu/makefile +++ b/vendor/tanglu/makefile @@ -9,3 +9,8 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&tanglu-codename;#$(shell ../getinfo tanglu-codename)#g' $< > $@ + +clean: clean/sources.list + +clean/sources.list: + rm -f sources.list -- cgit v1.2.3 From fc104da6a583736223b2f941e43a05ea26b63a7d Mon Sep 17 00:00:00 2001 From: Martin Pitt <martin.pitt@ubuntu.com> Date: Mon, 24 Feb 2014 19:12:44 +0100 Subject: Bug#739988: Fix autopkgtest missing dependencies and locale debian/tests/control: Add missing build-essential, fakeroot, and wget test dependencies. debian/tests/run-tests: Pin locale to C to avoid test failures in other locales. --- debian/tests/control | 2 +- debian/tests/run-tests | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/tests/control b/debian/tests/control index 12490a36f..209f16bfd 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests Restrictions: allow-stderr -Depends: @, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev +Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev diff --git a/debian/tests/run-tests b/debian/tests/run-tests index d9a9db7bf..6dc4eaa93 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,6 +2,9 @@ set -e +unset LANGUAGE +export LC_ALL=C + # we need the buildin webserver for the tests if [ ! -e environment.mak ]; then make startup -- cgit v1.2.3 From ed9665aedf77b3b8345bd4ed33de7885738e29f0 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 27 Feb 2014 16:46:05 +0100 Subject: initial version of apt-helper --- apt-pkg/acquire-item.cc | 2 +- cmdline/apt-helper.cc | 127 ++++++++++++++++++++++++++++ cmdline/makefile | 7 ++ debian/rules | 3 + debian/tests/run-tests | 1 + test/integration/framework | 43 ++-------- test/integration/test-apt-https-no-redirect | 2 +- 7 files changed, 148 insertions(+), 37 deletions(-) create mode 100644 cmdline/apt-helper.cc diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 36bb48382..de03011bf 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -2201,7 +2201,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash, if (stat(DestFile.c_str(),&Buf) == 0) { // Hmm, the partial file is too big, erase it - if ((unsigned long long)Buf.st_size > Size) + if ((Size > 0) && (unsigned long long)Buf.st_size > Size) unlink(DestFile.c_str()); else PartialSize = Buf.st_size; diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc new file mode 100644 index 000000000..c1c8b2178 --- /dev/null +++ b/cmdline/apt-helper.cc @@ -0,0 +1,127 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ##################################################################### + apt-helper - cmdline helpers + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include <config.h> + +#include <apt-pkg/cmndline.h> +#include <apt-pkg/error.h> +#include <apt-pkg/init.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/pkgsystem.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/acquire.h> +#include <apt-pkg/acquire-item.h> + +#include <apt-private/acqprogress.h> +#include <apt-private/private-output.h> +#include <apt-private/private-cmndline.h> + +#include <errno.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/wait.h> +#include <fcntl.h> + + + +#include <apti18n.h> + /*}}}*/ +using namespace std; + +bool DoDownloadFile(CommandLine &CmdL) +{ + if (CmdL.FileSize() <= 2) + return _error->Error(_("Must specify at least one pair url/filename")); + + + pkgAcquire Fetcher; + AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0)); + Fetcher.Setup(&Stat); + std::string download_uri = CmdL.FileList[1]; + std::string targetfile = CmdL.FileList[2]; + new pkgAcqFile(&Fetcher, download_uri, "", 0, "desc", "short-desc", + "dest-dir-ignored", targetfile); + Fetcher.Run(); + if (!FileExists(targetfile)) + { + _error->Error(_("Download Failed")); + return false; + } + return true; +} + +bool ShowHelp(CommandLine &CmdL) +{ + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, + COMMON_ARCH,__DATE__,__TIME__); + + if (_config->FindB("version") == true) + return true; + + cout << + _("Usage: apt-helper [options] command\n" + " apt-helper [options] download-file uri target-path\n" + "\n" + "apt-helper is a internal helper for apt\n" + "\n" + "Commands:\n" + " download-file - download the given uri to the target-path\n" + "\n" + " This APT helper has Super Meep Powers.\n"); + return true; +} + + +int main(int argc,const char *argv[]) /*{{{*/ +{ + CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp}, + {"download-file", &DoDownloadFile}, + {0,0}}; + + std::vector<CommandLine::Args> Args = getCommandArgs( + "apt-download", CommandLine::GetCommand(Cmds, argc, argv)); + + // Set up gettext support + setlocale(LC_ALL,""); + textdomain(PACKAGE); + + // Parse the command line and initialize the package library + CommandLine CmdL(Args.data(),_config); + if (pkgInitConfig(*_config) == false || + CmdL.Parse(argc,argv) == false || + pkgInitSystem(*_config,_system) == false) + { + if (_config->FindB("version") == true) + ShowHelp(CmdL); + _error->DumpErrors(); + return 100; + } + + // See if the help should be shown + if (_config->FindB("help") == true || + _config->FindB("version") == true || + CmdL.FileSize() == 0) + { + ShowHelp(CmdL); + return 0; + } + + InitOutput(); + + // Match the operation + CmdL.DispatchArg(Cmds); + + // Print any errors or warnings found during parsing + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) + _error->DumpErrors(); + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; +} + /*}}}*/ diff --git a/cmdline/makefile b/cmdline/makefile index f89192e10..c4a249cd6 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -47,6 +47,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = apt-mark.cc include $(PROGRAM_H) +# The apt-helper +PROGRAM=apt-helper +SLIBS = -lapt-pkg -lapt-private $(INTLLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = apt-helper.cc +include $(PROGRAM_H) + # The apt-report-mirror-failure program #SOURCE=apt-report-mirror-failure #TO=$(BIN) diff --git a/debian/rules b/debian/rules index 1b3782ab6..eec016607 100755 --- a/debian/rules +++ b/debian/rules @@ -207,6 +207,9 @@ apt: build-binary build-manpages debian/apt.install #mv debian/$@/usr/bin/apt-report-mirror-failure \ # debian/$@/usr/lib/apt/apt-report-mirror-failure \ + # move the apt-helper in place + mv debian/$@/usr/bin/apt-helper debian/$@/usr/lib/apt/apt-helper + dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 6dc4eaa93..e03db9b0c 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -14,5 +14,6 @@ make -C test/interactive-helper/ # run against the installed apt APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \ APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \ +APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ ./test/integration/run-tests diff --git a/test/integration/framework b/test/integration/framework index 99214ef73..911a4d742 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -111,6 +111,9 @@ aptftparchive() { runapt apt-ftparchive "$@"; } aptkey() { runapt apt-key "$@"; } aptmark() { runapt apt-mark "$@"; } apt() { runapt apt "$@"; } +apthelper() { + LD_LIBRARY_PATH=${APTHELPERBINDIR} ${APTHELPERBINDIR}/apt-helper "$@"; +} aptwebserver() { LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver "$@"; } @@ -177,6 +180,7 @@ setupenvironment() { # allow overriding the default BUILDDIR location BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"} METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} + APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"} APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- @@ -934,41 +938,10 @@ changetocdrom() { } downloadfile() { - PROTO="$(echo "$1" | cut -d':' -f 1)" - if [ ! -x "${METHODSDIR}/${PROTO}" ]; then - msgwarn "can not find ${METHODSDIR}/${PROTO}" - return 1 - fi - local DOWNLOG="${TMPWORKINGDIRECTORY}/download.log" - rm -f "$DOWNLOG" - touch "$DOWNLOG" - { - echo "601 Configuration -Config-Item: Acquire::https::CaInfo=${TESTDIR}/apt.pem -Config-Item: Debug::Acquire::${PROTO}=1 - -600 Acquire URI -URI: $1 -Filename: ${2} -" - # simple worker keeping stdin open until we are done (201) or error (400) - # and requesting new URIs on try-agains/redirects in-between - { tail -n 999 -f "$DOWNLOG" & echo "TAILPID: $!"; } | while read f1 f2; do - if [ "$f1" = 'TAILPID:' ]; then - TAILPID="$f2" - elif [ "$f1" = 'New-URI:' ]; then - echo "600 Acquire URI -URI: $f2 -Filename: ${2} -" - elif [ "$f1" = '201' ] || [ "$f1" = '400' ]; then - # tail would only die on next read – which never happens - test -z "$TAILPID" || kill -s HUP "$TAILPID" - break - fi - done - } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${METHODSDIR}/${PROTO} 2>&1 | tee "$DOWNLOG" - rm "$DOWNLOG" + PROTO="$(echo "$1" | cut -d':' -f 1)" + apthelper -o Acquire::https::CaInfo=${TESTDIR}/apt.pem \ + -o Debug::Acquire::${PROTO}=1 \ + download-file "$1" "$2" 2>&1 # only if the file exists the download was successful if [ -e "$2" ]; then return 0 diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect index c405d1167..0408c6832 100755 --- a/test/integration/test-apt-https-no-redirect +++ b/test/integration/test-apt-https-no-redirect @@ -19,6 +19,6 @@ 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 +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 || msgfail -- cgit v1.2.3 From e43a426e5d402d36eb180935fbbf1430a4a86e3f Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 27 Feb 2014 16:46:05 +0100 Subject: initial version of apt-helper --- apt-pkg/acquire-item.cc | 2 +- cmdline/apt-helper.cc | 127 ++++++++++++++++++++++++++++ cmdline/makefile | 7 ++ debian/rules | 3 + debian/tests/run-tests | 1 + test/integration/framework | 69 ++++----------- test/integration/test-apt-https-no-redirect | 20 ++++- 7 files changed, 174 insertions(+), 55 deletions(-) create mode 100644 cmdline/apt-helper.cc diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 36bb48382..de03011bf 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -2201,7 +2201,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash, if (stat(DestFile.c_str(),&Buf) == 0) { // Hmm, the partial file is too big, erase it - if ((unsigned long long)Buf.st_size > Size) + if ((Size > 0) && (unsigned long long)Buf.st_size > Size) unlink(DestFile.c_str()); else PartialSize = Buf.st_size; diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc new file mode 100644 index 000000000..c1c8b2178 --- /dev/null +++ b/cmdline/apt-helper.cc @@ -0,0 +1,127 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ##################################################################### + apt-helper - cmdline helpers + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include <config.h> + +#include <apt-pkg/cmndline.h> +#include <apt-pkg/error.h> +#include <apt-pkg/init.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/pkgsystem.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/acquire.h> +#include <apt-pkg/acquire-item.h> + +#include <apt-private/acqprogress.h> +#include <apt-private/private-output.h> +#include <apt-private/private-cmndline.h> + +#include <errno.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/wait.h> +#include <fcntl.h> + + + +#include <apti18n.h> + /*}}}*/ +using namespace std; + +bool DoDownloadFile(CommandLine &CmdL) +{ + if (CmdL.FileSize() <= 2) + return _error->Error(_("Must specify at least one pair url/filename")); + + + pkgAcquire Fetcher; + AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0)); + Fetcher.Setup(&Stat); + std::string download_uri = CmdL.FileList[1]; + std::string targetfile = CmdL.FileList[2]; + new pkgAcqFile(&Fetcher, download_uri, "", 0, "desc", "short-desc", + "dest-dir-ignored", targetfile); + Fetcher.Run(); + if (!FileExists(targetfile)) + { + _error->Error(_("Download Failed")); + return false; + } + return true; +} + +bool ShowHelp(CommandLine &CmdL) +{ + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, + COMMON_ARCH,__DATE__,__TIME__); + + if (_config->FindB("version") == true) + return true; + + cout << + _("Usage: apt-helper [options] command\n" + " apt-helper [options] download-file uri target-path\n" + "\n" + "apt-helper is a internal helper for apt\n" + "\n" + "Commands:\n" + " download-file - download the given uri to the target-path\n" + "\n" + " This APT helper has Super Meep Powers.\n"); + return true; +} + + +int main(int argc,const char *argv[]) /*{{{*/ +{ + CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp}, + {"download-file", &DoDownloadFile}, + {0,0}}; + + std::vector<CommandLine::Args> Args = getCommandArgs( + "apt-download", CommandLine::GetCommand(Cmds, argc, argv)); + + // Set up gettext support + setlocale(LC_ALL,""); + textdomain(PACKAGE); + + // Parse the command line and initialize the package library + CommandLine CmdL(Args.data(),_config); + if (pkgInitConfig(*_config) == false || + CmdL.Parse(argc,argv) == false || + pkgInitSystem(*_config,_system) == false) + { + if (_config->FindB("version") == true) + ShowHelp(CmdL); + _error->DumpErrors(); + return 100; + } + + // See if the help should be shown + if (_config->FindB("help") == true || + _config->FindB("version") == true || + CmdL.FileSize() == 0) + { + ShowHelp(CmdL); + return 0; + } + + InitOutput(); + + // Match the operation + CmdL.DispatchArg(Cmds); + + // Print any errors or warnings found during parsing + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) + _error->DumpErrors(); + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; +} + /*}}}*/ diff --git a/cmdline/makefile b/cmdline/makefile index f89192e10..c4a249cd6 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -47,6 +47,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = apt-mark.cc include $(PROGRAM_H) +# The apt-helper +PROGRAM=apt-helper +SLIBS = -lapt-pkg -lapt-private $(INTLLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = apt-helper.cc +include $(PROGRAM_H) + # The apt-report-mirror-failure program #SOURCE=apt-report-mirror-failure #TO=$(BIN) diff --git a/debian/rules b/debian/rules index 1b3782ab6..eec016607 100755 --- a/debian/rules +++ b/debian/rules @@ -207,6 +207,9 @@ apt: build-binary build-manpages debian/apt.install #mv debian/$@/usr/bin/apt-report-mirror-failure \ # debian/$@/usr/lib/apt/apt-report-mirror-failure \ + # move the apt-helper in place + mv debian/$@/usr/bin/apt-helper debian/$@/usr/lib/apt/apt-helper + dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 6dc4eaa93..e03db9b0c 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -14,5 +14,6 @@ make -C test/interactive-helper/ # run against the installed apt APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \ APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \ +APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ ./test/integration/run-tests diff --git a/test/integration/framework b/test/integration/framework index 99214ef73..d9bacef83 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -90,18 +90,18 @@ msgdone() { echo "${CDONE}DONE${CNORMAL}"; fi } - +getaptconfig() { + if [ -f ./aptconfig.conf ]; then + echo "./aptconfig.conf" + elif [ -f ../aptconfig.conf ]; then + echo "../aptconfig.conf" + fi +} runapt() { msgdebug "Executing: ${CCMD}$*${CDEBUG} " local CMD="$1" shift - if [ -f ./aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" - elif [ -f ../aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" - else - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" - fi + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" } aptconfig() { runapt apt-config "$@"; } aptcache() { runapt apt-cache "$@"; } @@ -111,6 +111,9 @@ aptftparchive() { runapt apt-ftparchive "$@"; } aptkey() { runapt apt-key "$@"; } aptmark() { runapt apt-mark "$@"; } apt() { runapt apt "$@"; } +apthelper() { + APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${APTHELPERBINDIR} ${APTHELPERBINDIR}/apt-helper "$@"; +} aptwebserver() { LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver "$@"; } @@ -118,17 +121,11 @@ dpkg() { command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" } aptitude() { - if [ -f ./aptconfig.conf ]; then - APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" - elif [ -f ../aptconfig.conf ]; then - APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" - else - LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" - fi + APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" } gdb() { echo "gdb: run »$*«" - APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command gdb ${BUILDDIRECTORY}/$1 --args "$@" + APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${BUILDDIRECTORY} command gdb ${BUILDDIRECTORY}/$1 --args "$@" } http() { LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/http @@ -177,6 +174,7 @@ setupenvironment() { # allow overriding the default BUILDDIR location BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"} METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} + APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"} APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- @@ -934,41 +932,10 @@ changetocdrom() { } downloadfile() { - PROTO="$(echo "$1" | cut -d':' -f 1)" - if [ ! -x "${METHODSDIR}/${PROTO}" ]; then - msgwarn "can not find ${METHODSDIR}/${PROTO}" - return 1 - fi - local DOWNLOG="${TMPWORKINGDIRECTORY}/download.log" - rm -f "$DOWNLOG" - touch "$DOWNLOG" - { - echo "601 Configuration -Config-Item: Acquire::https::CaInfo=${TESTDIR}/apt.pem -Config-Item: Debug::Acquire::${PROTO}=1 - -600 Acquire URI -URI: $1 -Filename: ${2} -" - # simple worker keeping stdin open until we are done (201) or error (400) - # and requesting new URIs on try-agains/redirects in-between - { tail -n 999 -f "$DOWNLOG" & echo "TAILPID: $!"; } | while read f1 f2; do - if [ "$f1" = 'TAILPID:' ]; then - TAILPID="$f2" - elif [ "$f1" = 'New-URI:' ]; then - echo "600 Acquire URI -URI: $f2 -Filename: ${2} -" - elif [ "$f1" = '201' ] || [ "$f1" = '400' ]; then - # tail would only die on next read – which never happens - test -z "$TAILPID" || kill -s HUP "$TAILPID" - break - fi - done - } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${METHODSDIR}/${PROTO} 2>&1 | tee "$DOWNLOG" - rm "$DOWNLOG" + PROTO="$(echo "$1" | cut -d':' -f 1)" + apthelper -o Acquire::https::CaInfo=${TESTDIR}/apt.pem \ + -o Debug::Acquire::${PROTO}=1 \ + download-file "$1" "$2" 2>&1 # only if the file exists the download was successful if [ -e "$2" ]; then return 0 diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect index c405d1167..106d4bced 100755 --- a/test/integration/test-apt-https-no-redirect +++ b/test/integration/test-apt-https-no-redirect @@ -12,13 +12,27 @@ setupaptarchive --no-update changetohttpswebserver -o 'aptwebserver::redirect::replace::/redirectme/=http://localhost:8080/' +DOWNLOG='download-testfile.log' msgtest 'normal http download works' -downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog2 >/dev/null 2>/dev/null && msgpass || msgfail +downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog2 > "$DOWNLOG" && msgpass || msgfail msgtest 'normal https download works' -downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog >/dev/null 2>/dev/null && msgpass || msgfail +downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog > "$DOWNLOG" && 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 +if ! downloadfile 'https://localhost:4433/redirectme/pool/apt_1.0/changelog' changelog3 > "$DOWNLOG"; then + msgpass +else + cat >&2 "$DOWNLOG" + msgfail +fi + +msgtest 'https methods given proper error on redirect attempt' +if grep -q 'Protocol http not supported or disabled in libcurl' "$DOWNLOG"; then + msgpass +else + cat >&2 "$DOWNLOG" + msgfail +fi -- cgit v1.2.3 From a4a5901577a2b0d72f1c973f036a8198046d937a Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 28 Feb 2014 08:46:25 +0100 Subject: releasing package apt version 0.9.15.5 --- configure.ac | 2 +- debian/changelog | 12 ++++++++++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 6 +++--- doc/po/de.po | 4 ++-- doc/po/es.po | 4 ++-- doc/po/fr.po | 4 ++-- doc/po/it.po | 4 ++-- doc/po/ja.po | 4 ++-- doc/po/pl.po | 4 ++-- doc/po/pt.po | 4 ++-- doc/po/pt_BR.po | 4 ++-- po/ar.po | 31 +++++++++++++++++++++++++++---- po/ast.po | 31 +++++++++++++++++++++++++++---- po/bg.po | 31 +++++++++++++++++++++++++++---- po/bs.po | 30 ++++++++++++++++++++++++++---- po/ca.po | 31 +++++++++++++++++++++++++++---- po/cs.po | 31 +++++++++++++++++++++++++++---- po/cy.po | 31 +++++++++++++++++++++++++++---- po/da.po | 31 +++++++++++++++++++++++++++---- po/de.po | 33 +++++++++++++++++++++++++++++---- po/dz.po | 31 +++++++++++++++++++++++++++---- po/el.po | 33 +++++++++++++++++++++++++++++---- po/es.po | 31 +++++++++++++++++++++++++++---- po/eu.po | 31 +++++++++++++++++++++++++++---- po/fi.po | 31 +++++++++++++++++++++++++++---- po/fr.po | 31 +++++++++++++++++++++++++++---- po/gl.po | 31 +++++++++++++++++++++++++++---- po/hu.po | 32 ++++++++++++++++++++++++++++---- po/it.po | 32 ++++++++++++++++++++++++++++---- po/ja.po | 32 ++++++++++++++++++++++++++++---- po/km.po | 31 +++++++++++++++++++++++++++---- po/ko.po | 31 +++++++++++++++++++++++++++---- po/ku.po | 30 ++++++++++++++++++++++++++---- po/lt.po | 31 +++++++++++++++++++++++++++---- po/mr.po | 31 +++++++++++++++++++++++++++---- po/nb.po | 31 +++++++++++++++++++++++++++---- po/ne.po | 31 +++++++++++++++++++++++++++---- po/nl.po | 33 +++++++++++++++++++++++++++++---- po/nn.po | 31 +++++++++++++++++++++++++++---- po/pl.po | 33 +++++++++++++++++++++++++++++---- po/pt.po | 31 +++++++++++++++++++++++++++---- po/pt_BR.po | 31 +++++++++++++++++++++++++++---- po/ro.po | 31 +++++++++++++++++++++++++++---- po/ru.po | 32 ++++++++++++++++++++++++++++---- po/sk.po | 31 +++++++++++++++++++++++++++---- po/sl.po | 32 ++++++++++++++++++++++++++++---- po/sv.po | 31 +++++++++++++++++++++++++++---- po/th.po | 31 +++++++++++++++++++++++++++---- po/tl.po | 31 +++++++++++++++++++++++++++---- po/tr.po | 31 +++++++++++++++++++++++++++---- po/uk.po | 33 +++++++++++++++++++++++++++++---- po/vi.po | 31 +++++++++++++++++++++++++++---- po/zh_CN.po | 31 +++++++++++++++++++++++++++---- po/zh_TW.po | 31 +++++++++++++++++++++++++++---- 55 files changed, 1207 insertions(+), 193 deletions(-) diff --git a/configure.ac b/configure.ac index a697597b5..40556ee54 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.4" +PACKAGE_VERSION="0.9.15.5" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index a3dd9af41..d12e7071f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.15.5) unstable; urgency=medium + + [ Michael Vogt ] + * vendor/tanglu/makefile: add missing clean/sources.list + * run the acquire tests with the new apt-helper binary, this + fixes the autopkgtest failures + + [ Martin Pitt ] + * Fix autopkgtest missing dependencies and locale (closes: #739988) + + -- Michael Vogt <mvo@debian.org> Fri, 28 Feb 2014 08:44:25 +0100 + apt (0.9.15.4) unstable; urgency=low [ Michael Vogt ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index b9e6a881a..6ff45e228 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15.4"> +<!ENTITY apt-product-version "0.9.15.5"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 348980dd7..11df9dc23 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.15.3\n" +"Project-Id-Version: apt-doc 0.9.15.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -6183,7 +6183,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/de.po b/doc/po/de.po index b7d84acc1..b5868a20c 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -8780,7 +8780,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/es.po b/doc/po/es.po index bcf0ccf51..5811d09da 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -8792,7 +8792,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/fr.po b/doc/po/fr.po index 2ae614b56..c1340a9b9 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -8753,7 +8753,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/it.po b/doc/po/it.po index 1050cee57..dc179cde7 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -8766,7 +8766,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index 99c2ea2c3..1e11de559 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -8336,7 +8336,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index dda23a5d3..a5e2a7fa8 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -7996,7 +7996,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index 99adcbaff..3927c4534 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -8700,7 +8700,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index c1014fbb0..5ba917dd4 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 08:46+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" @@ -6598,7 +6598,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/po/ar.po b/po/ar.po index 3b98d34fc..959f1549f 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -161,9 +161,10 @@ msgid " Version table:" msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" @@ -519,6 +520,28 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ast.po b/po/ast.po index f10324701..4adfc036a 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -154,9 +154,10 @@ msgid " Version table:" msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compiláu en %s %s\n" @@ -625,6 +626,28 @@ msgstr "" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/bg.po b/po/bg.po index 9bc639d8c..2ac50d677 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -160,9 +160,10 @@ msgid " Version table:" msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" @@ -632,6 +633,28 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/bs.po b/po/bs.po index b5d611697..a336a4edf 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -156,9 +156,10 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -525,6 +526,27 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" +#: cmdline/apt-helper.cc:39 +msgid "Must specify at least one pair url/filename" +msgstr "" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ca.po b/po/ca.po index 6ca12fcf0..a4779b71a 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -158,9 +158,10 @@ msgid " Version table:" msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" @@ -636,6 +637,28 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Haureu d'especificar un paquet de codi font per a baixar" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/cs.po b/po/cs.po index d3442e87f..c4f21b056 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -155,9 +155,10 @@ msgid " Version table:" msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pro %s zkompilován na %s %s\n" @@ -615,6 +616,28 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/cy.po b/po/cy.po index 7920dbb9a..81731354a 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -174,9 +174,10 @@ msgid " Version table:" msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" @@ -639,6 +640,28 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/da.po b/po/da.po index 05b80b394..d8d6e1b66 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -161,9 +161,10 @@ msgid " Version table:" msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompileret på %s %s\n" @@ -627,6 +628,28 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har »Super Cow Powers«.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Du skal angive mindst én pakke at hente kildeteksten til" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/de.po b/po/de.po index b097e830e..0ad8cf238 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -162,9 +162,10 @@ msgid " Version table:" msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s, kompiliert am %s %s\n" @@ -647,6 +648,30 @@ msgstr "" "bezüglich weitergehender Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " +"sollen." + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/dz.po b/po/dz.po index 2880a849f..2bb275d95 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -162,9 +162,10 @@ msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" @@ -617,6 +618,28 @@ msgstr "" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/el.po b/po/el.po index 923d455ca..8a17a0faf 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -167,9 +167,10 @@ msgid " Version table:" msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" @@ -629,6 +630,30 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " +"κωδικάτου" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/es.po b/po/es.po index 6848f4678..4345690fe 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -212,9 +212,10 @@ msgid " Version table:" msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" @@ -689,6 +690,28 @@ msgstr "" "para más información y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Debe especificar al menos un paquete para obtener su código fuente" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/eu.po b/po/eu.po index 48efb2b53..c54c859f9 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -160,9 +160,10 @@ msgid " Version table:" msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" @@ -616,6 +617,28 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/fi.po b/po/fi.po index b12d26f5c..78245b153 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -158,9 +158,10 @@ msgid " Version table:" msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n" @@ -611,6 +612,28 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/fr.po b/po/fr.po index 9aee2236c..5503dadb9 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -157,9 +157,10 @@ msgid " Version table:" msgstr " Table de version :" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" @@ -648,6 +649,28 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'options.\n" " Cet APT a les « Super Cow Powers »\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Vous devez spécifier au moins un paquet source" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/gl.po b/po/gl.po index 25e24dbcf..2a03773c2 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -162,9 +162,10 @@ msgid " Version table:" msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" @@ -634,6 +635,28 @@ msgstr "" "para obter mais información e opcións\n" " Este APT ten poderes da Super Vaca.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Ten que especificar polo menos un paquete para obter o código fonte" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/hu.po b/po/hu.po index d15ab8b6b..c28b83bfa 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -160,9 +160,10 @@ msgid " Version table:" msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s erre: %s lefordítva ekkor: %s %s\n" @@ -629,6 +630,29 @@ msgstr "" "információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/it.po b/po/it.po index 29c18c158..d15f8f115 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -160,9 +160,10 @@ msgid " Version table:" msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per %s compilato il %s %s\n" @@ -642,6 +643,29 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5).\n" " Questo APT ha i poteri della Super Mucca.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"È necessario specificare almeno un pacchetto di cui recuperare il sorgente" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ja.po b/po/ja.po index 517265903..39899be0a 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -157,9 +157,10 @@ msgid " Version table:" msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s コンパイル日時: %s %s\n" @@ -634,6 +635,29 @@ msgstr "" "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/km.po b/po/km.po index 321a989c3..bc7f492b9 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -162,9 +162,10 @@ msgid " Version table:" msgstr " តារាង​កំណែ ៖" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" @@ -609,6 +610,28 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ko.po b/po/ko.po index dd6b90dd6..f6524c6dc 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -153,9 +153,10 @@ msgid " Version table:" msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" @@ -616,6 +617,28 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ku.po b/po/ku.po index 55d6f7765..421f1779f 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -161,9 +161,10 @@ msgid " Version table:" msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" @@ -531,6 +532,27 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" +#: cmdline/apt-helper.cc:39 +msgid "Must specify at least one pair url/filename" +msgstr "" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/lt.po b/po/lt.po index f707ff448..b799099b6 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -159,9 +159,10 @@ msgid " Version table:" msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -535,6 +536,28 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/mr.po b/po/mr.po index 2b4d3103f..ea1c478e9 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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 " @@ -156,9 +156,10 @@ msgid " Version table:" msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n" @@ -605,6 +606,28 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/nb.po b/po/nb.po index ed0c7b9fe..ff68ac0ca 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -161,9 +161,10 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompilert på %s %s\n" @@ -620,6 +621,28 @@ msgstr "" "for mer informasjon og flere valg.\n" " Denne APT har kraften til en Superku.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Du må angi minst en pakke du vil ha kildekoden til" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ne.po b/po/ne.po index 1779c9f4a..30b7be69d 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -159,9 +159,10 @@ msgid " Version table:" msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" @@ -607,6 +608,28 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/nl.po b/po/nl.po index dd7fe40f3..48ac54a1b 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -159,9 +159,10 @@ msgid " Version table:" msgstr " Versietabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" @@ -632,6 +633,30 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koe kracht.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " +"worden" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/nn.po b/po/nn.po index 29b8b6f60..8b5275196 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -161,9 +161,10 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -614,6 +615,28 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/pl.po b/po/pl.po index b2c1e3658..40e1016e7 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -163,9 +163,10 @@ msgid " Version table:" msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" @@ -636,6 +637,30 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " +"źródła" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/pt.po b/po/pt.po index 2007af808..516c18892 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -159,9 +159,10 @@ msgid " Version table:" msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -632,6 +633,28 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 746f78de6..a9cff2f35 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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." @@ -159,9 +159,10 @@ msgid " Version table:" msgstr " Tabela de versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -624,6 +625,28 @@ msgstr "" "para mais informações e opções.\n" " Este APT tem Poderes de Super Vaca.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ro.po b/po/ro.po index 2b9872364..1fde2d15b 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -160,9 +160,10 @@ msgid " Version table:" msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s compilat la %s %s\n" @@ -623,6 +624,28 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/ru.po b/po/ru.po index e0654f524..286d558d0 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -164,9 +164,10 @@ msgid " Version table:" msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" @@ -635,6 +636,29 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"Укажите как минимум один пакет, исходный код которого необходимо получить" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/sk.po b/po/sk.po index aeccfe524..3f3266fb2 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -160,9 +160,10 @@ msgid " Version table:" msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pre %s skompilovaný %s %s\n" @@ -624,6 +625,28 @@ msgstr "" "a apt.conf(5).\n" " Tento APT má schopnosti posvätnej kravy.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/sl.po b/po/sl.po index 721aae6d2..0de57e349 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -158,9 +158,10 @@ msgid " Version table:" msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s kodno preveden na %s %s\n" @@ -620,6 +621,29 @@ msgstr "" " sources.list(5) in apt.conf(5). \n" " Ta APT ima moči super krav.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/sv.po b/po/sv.po index 7a0beb545..2423b54a9 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -158,9 +158,10 @@ msgid " Version table:" msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s för %s kompilerad den %s %s\n" @@ -623,6 +624,28 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Du måste ange minst ett paket att hämta källkod för" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/th.po b/po/th.po index 3129e2686..a60dc7434 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -156,9 +156,10 @@ msgid " Version table:" msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" @@ -608,6 +609,28 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/tl.po b/po/tl.po index 74ca8ec38..fd43208ea 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -162,9 +162,10 @@ msgid " Version table:" msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -620,6 +621,28 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/tr.po b/po/tr.po index 10de5a852..4027ecc85 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -160,9 +160,10 @@ msgid " Version table:" msgstr " Sürüm çizelgesi:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s (%s için) %s %s tarihinde derlendi\n" @@ -626,6 +627,28 @@ msgstr "" "sayfalarına bakabilirsiniz.\n" " Bu APT'nin Süper İnek Güçleri vardır.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Kaynağının indirileceği en az bir paket seçilmeli" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/uk.po b/po/uk.po index 957743d91..707124c13 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -165,9 +165,10 @@ msgid " Version table:" msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпільовано %s %s\n" @@ -636,6 +637,30 @@ msgstr "" "містять більше інформації і опцій.\n" " Цей APT має Супер-Коров'ячу Силу.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "" +"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " +"тексти" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/vi.po b/po/vi.po index f7477fd12..4f9341c6f 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -162,9 +162,10 @@ msgid " Version table:" msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s-%s được biên dịch cho %s vào lúc “%s %s”\n" @@ -642,6 +643,28 @@ msgstr "" " apt-get(8), sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5df69c4ee..31ae60ab0 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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" @@ -157,9 +157,10 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" @@ -612,6 +613,28 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "要下载源代码，必须指定至少一个对应的软件包" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 1c88254ff..cdb02aa55 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-23 00:29+0100\n" +"POT-Creation-Date: 2014-02-28 10:56+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." @@ -158,9 +158,10 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 +#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 +#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n" @@ -605,6 +606,28 @@ msgstr "" "以取得更多資訊和選項。\n" " 該 APT 有著超級牛力。\n" +#: cmdline/apt-helper.cc:39 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "在取得原始碼時必須至少指定一個套件" + +#: cmdline/apt-helper.cc:52 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:67 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + #: cmdline/apt-mark.cc:57 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" -- cgit v1.2.3 From 9e3142e16c2ccb4b51f5a8122f5a8e8c0fab9f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Ng=E1=BB=8Dc=20Qu=C3=A2n?= <vnwildman@gmail.com> Date: Mon, 3 Mar 2014 15:41:01 +0700 Subject: l10n: vi.po (624t): Update Vietnamese translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com> --- po/vi.po | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/po/vi.po b/po/vi.po index 4f9341c6f..61f5ef3fe 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt 0.9.15.1\n" +"Project-Id-Version: apt 0.9.15.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2014-02-28 10:56+0100\n" -"PO-Revision-Date: 2014-02-10 07:50+0700\n" +"PO-Revision-Date: 2014-03-03 15:40+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -25,7 +25,7 @@ msgstr "" #: cmdline/apt-cache.cc:140 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Gói %s phiên bản %s chưa thỏa mãn quan hệ phụ thuộc:\n" +msgstr "Gói %s phiên bản %s có phần phụ thuộc chưa thỏa mãn:\n" #: cmdline/apt-cache.cc:268 msgid "Total package names: " @@ -120,7 +120,7 @@ msgstr "" #: 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" +msgstr "Không thể định vị gói %s" #: cmdline/apt-cache.cc:1536 msgid "Package files:" @@ -644,13 +644,12 @@ msgstr "" " Trình APT này có năng lực của siêu bò.\n" #: cmdline/apt-helper.cc:39 -#, fuzzy msgid "Must specify at least one pair url/filename" -msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" +msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin" #: cmdline/apt-helper.cc:52 msgid "Download Failed" -msgstr "" +msgstr "Gặp lỗi khi tải về" #: cmdline/apt-helper.cc:67 msgid "" @@ -664,6 +663,15 @@ msgid "" "\n" " This APT helper has Super Meep Powers.\n" msgstr "" +"Cách dùng: apt-helper [các-tùy-chọn] lệnh\n" +" apt-helper [các-tùy-chọn] download-file uri đường-dẫn-đích\n" +"\n" +"apt-helper là phần trợ giúp dành cho apt\n" +"\n" +"Các lệnh:\n" +" download-file - tải về uri đã cho về đường-dẫn-đích\n" +"\n" +" Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep”.\n" #: cmdline/apt-mark.cc:57 #, c-format @@ -766,7 +774,6 @@ msgstr "" " apt-mark(8) và apt.conf(5)" #: cmdline/apt.cc:71 -#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" @@ -790,7 +797,7 @@ msgstr "" "Cách dùng: apt [các tùy chọn] lệnh\n" "\n" "CLI (giao diện dòng lệnh) dành cho apt.\n" -"Lệnh: \n" +"Các lệnh cơ bản:\n" " list - liệt kê các gói dựa trên cơ sở là tên gói\n" " search - tìm trong phần mô tả của gói\n" " show - hiển thị thông tin chi tiết về gói\n" @@ -2269,11 +2276,11 @@ msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn li #: apt-inst/filelist.cc:414 msgid "Failed to locate the hash element!" -msgstr "Gặp lỗi xác định vị trí phần tử băm!" +msgstr "Gặp lỗi khi định vị phần tử băm!" #: apt-inst/filelist.cc:461 msgid "Failed to allocate diversion" -msgstr "Gặp lỗi khi xác định vị trí trệch đi" +msgstr "Gặp lỗi khi định vị trệch đi" #: apt-inst/filelist.cc:466 msgid "Internal error in AddDiversion" @@ -2335,7 +2342,7 @@ msgstr "Thư mục %s đang được thay thế do một cái không phải là #: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" -msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" +msgstr "Gặp lỗi định vị điểm nút trong hộp băm nó bị lỗi" #: apt-inst/extract.cc:286 msgid "The path is too long" @@ -2365,7 +2372,7 @@ msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành #: apt-inst/deb/debfile.cc:124 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" +msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s" #: apt-inst/deb/debfile.cc:219 msgid "Unparsable control file" @@ -2535,7 +2542,7 @@ msgstr "%c%s... %u%%" #: apt-pkg/contrib/cmndline.cc:116 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." +msgstr "Không hiểu tùy chọn dòng lệnh “%c” [từ %s]." #: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 #: apt-pkg/contrib/cmndline.cc:158 @@ -2998,9 +3005,9 @@ 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:115 -#, fuzzy, c-format +#, 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" +msgstr "Gói “%s” đã được cài đặt chưa?" #: apt-pkg/acquire-worker.cc:166 #, c-format @@ -3134,7 +3141,7 @@ msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." #: apt-pkg/acquire-item.cc:154 msgid "Hash Sum mismatch" -msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" +msgstr "Mã băm tổng kiểm tra không khớp" #: apt-pkg/acquire-item.cc:159 msgid "Size mismatch" @@ -3380,9 +3387,9 @@ 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:605 -#, fuzzy, c-format +#, 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”" +msgstr "Không tìm thấy gói nào theo đường dẫn “%s”" #: apt-pkg/cacheset.cc:616 #, c-format -- cgit v1.2.3 From c1409d1be88557529c62883be3174793481233de Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Wed, 12 Mar 2014 20:33:05 +0100 Subject: add hashsum support in apt-file download and add more tests --- apt-pkg/contrib/fileutl.cc | 11 +++++++++++ apt-pkg/contrib/fileutl.h | 1 + cmdline/apt-helper.cc | 11 +++++++++++ test/integration/test-apt-helper | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100755 test/integration/test-apt-helper diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 52411a762..79bcf112c 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1841,3 +1841,14 @@ std::string GetTempDir() return string(tmpdir); } + +bool Rename(std::string From, std::string To) +{ + if (rename(From.c_str(),To.c_str()) != 0) + { + _error->Error(_("rename failed, %s (%s -> %s)."),strerror(errno), + From.c_str(),To.c_str()); + return false; + } + return true; +} diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index e752e9621..f0569b6fd 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -164,6 +164,7 @@ bool RealFileExists(std::string File); bool DirectoryExists(std::string const &Path) __attrib_const; bool CreateDirectory(std::string const &Parent, std::string const &Path); time_t GetModificationTime(std::string const &Path); +bool Rename(std::string From, std::string To); std::string GetTempDir(); diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index c1c8b2178..4a24b01d9 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -44,6 +44,9 @@ bool DoDownloadFile(CommandLine &CmdL) Fetcher.Setup(&Stat); std::string download_uri = CmdL.FileList[1]; std::string targetfile = CmdL.FileList[2]; + HashString hash; + if (CmdL.FileSize() > 3) + hash = HashString(CmdL.FileList[3]); new pkgAcqFile(&Fetcher, download_uri, "", 0, "desc", "short-desc", "dest-dir-ignored", targetfile); Fetcher.Run(); @@ -52,6 +55,14 @@ bool DoDownloadFile(CommandLine &CmdL) _error->Error(_("Download Failed")); return false; } + if(hash.empty() == false) + if(hash.VerifyFile(targetfile) == false) + { + _error->Error(_("HashSum Failed")); + Rename(targetfile, targetfile+".failed"); + return false; + } + return true; } diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper new file mode 100755 index 000000000..37ed95181 --- /dev/null +++ b/test/integration/test-apt-helper @@ -0,0 +1,37 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +changetohttpswebserver + +echo "foo" > aptarchive/foo + +msgtest 'apt-file download-file md5sum' +apthelper -qq download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 && msgpass || msgfail +testfileequal foo2 'foo' + +msgtest 'apt-file download-file sha1' +apthelper -qq download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 && msgpass || msgfail +testfileequal foo1 'foo' + +msgtest 'apt-file download-file sha256' +apthelper -qq download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c && msgpass || msgfail +testfileequal foo3 'foo' + +msgtest 'apt-file download-file no-hash' +apthelper -qq download-file http://localhost:8080/foo foo4 && msgpass || msgfail +testfileequal foo4 'foo' + +msgtest 'apt-file download-file wrong hash' +if ! apthelper -qq download-file http://localhost:8080/foo foo5 MD5Sum:aabbcc 2>&1 2> download.stderr; then + msgpass +else + msgfail +fi +testfileequal download.stderr 'E: HashSum Failed' +testfileequal foo5.failed 'foo' -- cgit v1.2.3 From 93bd01f7e0606b3f778401fb772fb3cb56cb3697 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Wed, 12 Mar 2014 20:46:36 +0100 Subject: Promote xz-utils from apt Suggests to libapt-pkg Depends libapt-pkg depends on the other compressors, and now that xz is the default in many cases, it should depend on that one as well. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 0c1341bb9..2d58d0711 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Conflicts: python-apt (<< 0.7.93.2~) -Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt +Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, python-apt Description: commandline package manager This package provides commandline tools for searching and managing as well as querying information about packages @@ -41,7 +41,7 @@ Package: libapt-pkg4.12 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, xz-utils Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~) Section: libs Description: package management runtime library -- cgit v1.2.3 From 8daf68e366fa9fa2794ae667f51562663856237c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 15 Feb 2014 13:38:39 +0100 Subject: propagate a negative score point along breaks/conflicts versioned -dev packages like db and boost have the problem of no dependencies which would give them a competitive advantage against an older incarnation of the -dev package, so they tend to be kept back until the old version is removed from the archive, which, if the user has older releases in its sources can take a long time (or never happens). The newer version has a conflicts/breaks against the older one, but the older one hasn't against the newer, so by giving via the conflicts the older one a reduced score the newer one can win if there is no other reason to keep it. If both have a conflict against each other the scoring will cancel itself out, so no harm done. This gives "action" a slightly bigger edge in breaks/conflicts cases than before, but holding back isn't a really good solution anyway. --- apt-pkg/algorithms.cc | 39 +++++++++++------- .../test-allow-scores-for-all-dependency-types | 47 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 14 deletions(-) create mode 100755 test/integration/test-allow-scores-for-all-dependency-types diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 0363ab3e2..db1ebd7e3 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -394,8 +394,18 @@ void pkgProblemResolver::MakeScores() }; int PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100); int PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1); - int PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1); - int PrioRecommends = _config->FindI("pkgProblemResolver::Scores::Recommends",1); + int DepMap[] = { + 0, + _config->FindI("pkgProblemResolver::Scores::Depends",1), + _config->FindI("pkgProblemResolver::Scores::PreDepends",1), + _config->FindI("pkgProblemResolver::Scores::Suggests",0), + _config->FindI("pkgProblemResolver::Scores::Recommends",1), + _config->FindI("pkgProblemResolver::Scores::Conflicts",-1), + _config->FindI("pkgProblemResolver::Scores::Replaces",0), + _config->FindI("pkgProblemResolver::Scores::Obsoletes",0), + _config->FindI("pkgProblemResolver::Scores::Breaks",-1), + _config->FindI("pkgProblemResolver::Scores::Enhances",0) + }; int AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000); int AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000); @@ -408,8 +418,15 @@ void pkgProblemResolver::MakeScores() << " Extra => " << PrioMap[pkgCache::State::Extra] << endl << " Essentials => " << PrioEssentials << endl << " InstalledAndNotObsolete => " << PrioInstalledAndNotObsolete << endl - << " Depends => " << PrioDepends << endl - << " Recommends => " << PrioRecommends << endl + << " Pre-Depends => " << DepMap[pkgCache::Dep::PreDepends] << endl + << " Depends => " << DepMap[pkgCache::Dep::Depends] << endl + << " Recommends => " << DepMap[pkgCache::Dep::Recommends] << endl + << " Suggests => " << DepMap[pkgCache::Dep::Suggests] << endl + << " Conflicts => " << DepMap[pkgCache::Dep::Conflicts] << endl + << " Breaks => " << DepMap[pkgCache::Dep::DpkgBreaks] << endl + << " Replaces => " << DepMap[pkgCache::Dep::Replaces] << endl + << " Obsoletes => " << DepMap[pkgCache::Dep::Obsoletes] << endl + << " Enhances => " << DepMap[pkgCache::Dep::Enhances] << endl << " AddProtected => " << AddProtected << endl << " AddEssential => " << AddEssential << endl; @@ -446,17 +463,11 @@ void pkgProblemResolver::MakeScores() { if (Cache[I].InstallVer == 0) continue; - + for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; ++D) - { - if (D->Type == pkgCache::Dep::Depends || - D->Type == pkgCache::Dep::PreDepends) - Scores[D.TargetPkg()->ID] += PrioDepends; - else if (D->Type == pkgCache::Dep::Recommends) - Scores[D.TargetPkg()->ID] += PrioRecommends; - } - } - + Scores[D.TargetPkg()->ID] += DepMap[D->Type]; + } + // Copy the scores to advoid additive looping SPtrArray<int> OldScores = new int[Size]; memcpy(OldScores,Scores,sizeof(*Scores)*Size); diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types new file mode 100755 index 000000000..7e15a883b --- /dev/null +++ b/test/integration/test-allow-scores-for-all-dependency-types @@ -0,0 +1,47 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +insertinstalledpackage 'libdb-dev' 'amd64' '5.1.7' 'Depends: libdb5.1-dev' +insertinstalledpackage 'libdb5.1-dev' 'amd64' '5.1.29-7' + +insertpackage 'unstable' 'libdb-dev' 'amd64' '5.3.0' 'Depends: libdb5.3-dev +Conflicts: libdb5.1-dev' +insertpackage 'unstable' 'libdb5.1-dev' 'amd64' '5.1.29-7' +insertpackage 'unstable' 'libdb5.3-dev' 'amd64' '5.3.28-3' 'Conflicts: libdb5.1-dev' + +insertpackage 'unstable' 'foo' 'amd64' '1' +insertpackage 'unstable' 'bar' 'amd64' '1' +insertpackage 'unstable' 'foo' 'amd64' '2' 'Conflicts: bar' +insertpackage 'unstable' 'bar' 'amd64' '2' 'Conflicts: foo' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + libdb5.1-dev +The following NEW packages will be installed: + libdb5.3-dev +The following packages will be upgraded: + libdb-dev +1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded. +Remv libdb5.1-dev [5.1.29-7] [libdb-dev:amd64 ] +Inst libdb-dev [5.1.7] (5.3.0 unstable [amd64]) [] +Inst libdb5.3-dev (5.3.28-3 unstable [amd64]) +Conf libdb5.3-dev (5.3.28-3 unstable [amd64]) +Conf libdb-dev (5.3.0 unstable [amd64])' aptget dist-upgrade -s + +rm rootdir/var/lib/dpkg/status +insertinstalledpackage 'foo' 'amd64' '1' +insertinstalledpackage 'bar' 'amd64' '1' + +testequal 'Reading package lists... +Building dependency tree... +The following packages have been kept back: + bar foo +0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -s -- cgit v1.2.3 From cb4b85b0bdba6a0c43ca62259dcd35fccd38a45a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 15 Feb 2014 14:47:24 +0100 Subject: do not do the same looping twice Git-Dch: Ignore --- apt-pkg/algorithms.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index db1ebd7e3..4d86e5ff8 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -456,14 +456,8 @@ void pkgProblemResolver::MakeScores() */ if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable()) Score += PrioInstalledAndNotObsolete; - } - - // Now that we have the base scores we go and propagate dependencies - for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I) - { - if (Cache[I].InstallVer == 0) - continue; + // propagate score points along dependencies for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; ++D) Scores[D.TargetPkg()->ID] += DepMap[D->Type]; } -- cgit v1.2.3 From 2252183c69fb5e3e020b45c37d9728b3437d797d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sun, 23 Feb 2014 22:22:15 +0100 Subject: show debug output only if told so in packagemanager Git-Dch: Ignore --- apt-pkg/packagemanager.cc | 3 ++- test/integration/test-conflicts-loop | 12 +++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 5f9a31264..0be76b311 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -741,7 +741,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c // See if the current version is conflicting if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg)) { - clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl; + if (Debug) + clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl; /* If a loop is not present or has not yet been detected, attempt to unpack packages to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */ if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false) diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop index 4407fbd9d..4978fe1e8 100755 --- a/test/integration/test-conflicts-loop +++ b/test/integration/test-conflicts-loop @@ -6,11 +6,11 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" -insertinstalledpackage 'openjdk-6-jre' 'i386' '6b16-1.8-0ubuntu1' +insertinstalledpackage 'openjdk-6-jre' 'i386' '6b16-1.8-0ubuntu1' insertpackage 'unstable' 'openjdk-6-jre' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)' -insertinstalledpackage 'openjdk-6-jre-lib' 'i386' '6b16-1.8-0ubuntu1' +insertinstalledpackage 'openjdk-6-jre-lib' 'i386' '6b16-1.8-0ubuntu1' insertpackage 'unstable' 'openjdk-6-jre-lib' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-headless (<< 6b17~pre3-1)' -insertinstalledpackage 'openjdk-6-jre-headless' 'i386' '6b16-1.8-0ubuntu1' +insertinstalledpackage 'openjdk-6-jre-headless' 'i386' '6b16-1.8-0ubuntu1' insertpackage 'unstable' 'openjdk-6-jre-headless' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)' setupaptarchive @@ -19,16 +19,10 @@ testequal 'Reading package lists... Building dependency tree... The following packages will be upgraded: openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib - openjdk-6-jre-lib:i386 conflicts with openjdk-6-jre:i386 - openjdk-6-jre:i386 conflicts with openjdk-6-jre-headless:i386 - openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre:i386 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. Remv openjdk-6-jre [6b16-1.8-0ubuntu1] - openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386 Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1] Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) - openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386 - openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386 Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) -- cgit v1.2.3 From 9ec748ff103840c4c65471ca00d3b72984131ce4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sun, 23 Feb 2014 22:24:27 +0100 Subject: check version before adding scores in resolver Prevents that "old" dependencies have an influence in the scoring. With positive dependencies this is usually not a problem, but negative dependencies can linger around for a long time. --- apt-pkg/algorithms.cc | 13 +- .../test-allow-scores-for-all-dependency-types | 131 ++++++++++++++++++--- 2 files changed, 126 insertions(+), 18 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 4d86e5ff8..8320e7ef0 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -459,7 +459,18 @@ void pkgProblemResolver::MakeScores() // propagate score points along dependencies for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; ++D) - Scores[D.TargetPkg()->ID] += DepMap[D->Type]; + { + if (DepMap[D->Type] == 0) + continue; + pkgCache::PkgIterator const T = D.TargetPkg(); + if (D->Version != 0) + { + pkgCache::VerIterator const IV = Cache[T].InstVerIter(Cache); + if (IV.end() == true || D.IsSatisfied(IV) != D.IsNegative()) + continue; + } + Scores[T->ID] += DepMap[D->Type]; + } } // Copy the scores to advoid additive looping diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types index 7e15a883b..a5c98f3d6 100755 --- a/test/integration/test-allow-scores-for-all-dependency-types +++ b/test/integration/test-allow-scores-for-all-dependency-types @@ -6,21 +6,51 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture 'amd64' -insertinstalledpackage 'libdb-dev' 'amd64' '5.1.7' 'Depends: libdb5.1-dev' -insertinstalledpackage 'libdb5.1-dev' 'amd64' '5.1.29-7' - -insertpackage 'unstable' 'libdb-dev' 'amd64' '5.3.0' 'Depends: libdb5.3-dev +insertpackage 'unversioned' 'libdb-dev' 'amd64' '5.3.0' 'Depends: libdb5.3-dev Conflicts: libdb5.1-dev' -insertpackage 'unstable' 'libdb5.1-dev' 'amd64' '5.1.29-7' -insertpackage 'unstable' 'libdb5.3-dev' 'amd64' '5.3.28-3' 'Conflicts: libdb5.1-dev' +insertpackage 'unversioned' 'libdb5.1-dev' 'amd64' '5.1.29-7' +insertpackage 'unversioned' 'libdb5.3-dev' 'amd64' '5.3.28-3' 'Conflicts: libdb5.1-dev' + +insertpackage 'unversioned' 'foo' 'amd64' '1' +insertpackage 'unversioned' 'bar' 'amd64' '1' +insertpackage 'unversioned' 'foo' 'amd64' '2' 'Conflicts: bar' +insertpackage 'unversioned' 'bar' 'amd64' '2' 'Conflicts: foo' +insertpackage 'unversioned' 'baz' 'amd64' '2' 'Depends: bar | foo' + +insertpackage 'versioned' 'libdb-dev' 'amd64' '5.3.0' 'Depends: libdb5.3-dev +Conflicts: libdb5.1-dev (<< 5.2)' +insertpackage 'versioned' 'libdb5.3-dev' 'amd64' '5.3.28-3' 'Conflicts: libdb5.1-dev (<< 5.2)' + +insertpackage 'versioned' 'foo' 'amd64' '2' 'Conflicts: bar (<= 2)' +insertpackage 'versioned' 'bar' 'amd64' '2' 'Conflicts: foo (<= 2)' +insertpackage 'versioned' 'baz' 'amd64' '2' 'Depends: bar (>= 2) | foo (>= 2)' + +insertpackage 'multipleno' 'foo' 'amd64' '2.1' 'Conflicts: bar (<= 3)' +insertpackage 'multipleno' 'bar' 'amd64' '2.1' 'Conflicts: foo (<= 3), foo (<= 1)' -insertpackage 'unstable' 'foo' 'amd64' '1' -insertpackage 'unstable' 'bar' 'amd64' '1' -insertpackage 'unstable' 'foo' 'amd64' '2' 'Conflicts: bar' -insertpackage 'unstable' 'bar' 'amd64' '2' 'Conflicts: foo' +insertpackage 'multipleyes' 'foo' 'amd64' '2.2' 'Conflicts: bar (<= 3)' +# having foo multiple times as conflict is a non-advisable hack in general +insertpackage 'multipleyes' 'bar' 'amd64' '2.2' 'Conflicts: foo (<= 3), foo (<= 3)' +cp rootdir/var/lib/dpkg/status rootdir/var/lib/dpkg/status-backup setupaptarchive +insertinstalledpackage 'libdb-dev' 'amd64' '5.1.7' 'Depends: libdb5.1-dev' +insertinstalledpackage 'libdb5.1-dev' 'amd64' '5.1.29-7' +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + libdb5.1-dev +The following NEW packages will be installed: + libdb5.3-dev +The following packages will be upgraded: + libdb-dev +1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded. +Remv libdb5.1-dev [5.1.29-7] [libdb-dev:amd64 ] +Inst libdb-dev [5.1.7] (5.3.0 unversioned [amd64]) [] +Inst libdb5.3-dev (5.3.28-3 unversioned [amd64]) +Conf libdb5.3-dev (5.3.28-3 unversioned [amd64]) +Conf libdb-dev (5.3.0 unversioned [amd64])' aptget dist-upgrade -st unversioned testequal 'Reading package lists... Building dependency tree... The following packages will be REMOVED: @@ -31,17 +61,84 @@ The following packages will be upgraded: libdb-dev 1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded. Remv libdb5.1-dev [5.1.29-7] [libdb-dev:amd64 ] -Inst libdb-dev [5.1.7] (5.3.0 unstable [amd64]) [] -Inst libdb5.3-dev (5.3.28-3 unstable [amd64]) -Conf libdb5.3-dev (5.3.28-3 unstable [amd64]) -Conf libdb-dev (5.3.0 unstable [amd64])' aptget dist-upgrade -s +Inst libdb-dev [5.1.7] (5.3.0 versioned [amd64]) [] +Inst libdb5.3-dev (5.3.28-3 versioned [amd64]) +Conf libdb5.3-dev (5.3.28-3 versioned [amd64]) +Conf libdb-dev (5.3.0 versioned [amd64])' aptget dist-upgrade -st versioned -rm rootdir/var/lib/dpkg/status +cp -f rootdir/var/lib/dpkg/status-backup rootdir/var/lib/dpkg/status insertinstalledpackage 'foo' 'amd64' '1' insertinstalledpackage 'bar' 'amd64' '1' - testequal 'Reading package lists... Building dependency tree... The following packages have been kept back: bar foo -0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -s +0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st unversioned +testequal 'Reading package lists... +Building dependency tree... +The following packages have been kept back: + bar foo +0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st versioned +testequal 'Reading package lists... +Building dependency tree... +The following packages have been kept back: + bar foo +0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st multipleno +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + foo +The following packages will be upgraded: + bar +1 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv foo [1] +Inst bar [1] (2.2 multipleyes [amd64]) +Conf bar (2.2 multipleyes [amd64])' aptget dist-upgrade -st multipleyes + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + baz +0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. +Inst baz (2 unversioned [amd64]) +Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following packages will be REMOVED: + bar +The following NEW packages will be installed: + baz +The following packages will be upgraded: + foo +1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded. +Remv bar [1] +Inst foo [1] (2 versioned [amd64]) +Inst baz (2 versioned [amd64]) +Conf foo (2 versioned [amd64]) +Conf baz (2 versioned [amd64])' aptget install baz -st versioned + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + baz +0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. +Inst baz (2 unversioned [amd64]) +Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following packages will be REMOVED: + bar +The following NEW packages will be installed: + baz +The following packages will be upgraded: + foo +1 upgraded, 1 newly installed, 1 to remove and 0 not upgraded. +Remv bar [1] +Inst foo [1] (2 versioned [amd64]) +Inst baz (2 versioned [amd64]) +Conf foo (2 versioned [amd64]) +Conf baz (2 versioned [amd64])' aptget install baz -st versioned -- cgit v1.2.3 From fa19cc9573aac19cfbf43364d4b5660c9ab645bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 24 Feb 2014 00:25:29 +0100 Subject: autogenerate makefile for vendor system It can be useful to have a whole makefile available for vendor setup, but by providing a basic one we can deal with the simple cases more easily (and changes to the system are presumably easier). --- .gitignore | 4 ++-- doc/apt-verbatim.ent | 1 - vendor/debian/makefile | 17 ----------------- vendor/debian/sources.list.in | 8 ++++---- vendor/getinfo | 20 ++++++++++++-------- vendor/makefile | 38 ++++++++++++++++++++++++-------------- vendor/raspbian/makefile | 16 ---------------- vendor/steamos/apt-vendor.ent | 2 +- vendor/steamos/makefile | 17 ----------------- vendor/steamos/sources.list.in | 4 ++-- vendor/tanglu/apt-vendor.ent | 1 + vendor/tanglu/makefile | 16 ---------------- vendor/tanglu/sources.list.in | 8 ++++---- vendor/ubuntu/makefile | 16 ---------------- vendor/vendor.makefile | 21 +++++++++++++++++++++ 15 files changed, 71 insertions(+), 118 deletions(-) delete mode 100644 vendor/debian/makefile delete mode 100644 vendor/raspbian/makefile delete mode 100644 vendor/steamos/makefile delete mode 100644 vendor/tanglu/makefile delete mode 100644 vendor/ubuntu/makefile create mode 100644 vendor/vendor.makefile diff --git a/.gitignore b/.gitignore index 69a229c3e..2c619ab57 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,5 @@ /debian/libapt-inst*.install /debian/libapt-pkg-dev.install /vendor/current -/vendor/debian/sources.list -/vendor/ubuntu/sources.list +/vendor/*/sources.list +/vendor/*/makefile.auto diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 6ff45e228..75aa02c8f 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -226,7 +226,6 @@ <!ENTITY stable-codename "wheezy"> <!ENTITY testing-codename "jessie"> <!ENTITY stable-version "7"> -<!ENTITY tanglu-codename "bartholomea"> <!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… diff --git a/vendor/debian/makefile b/vendor/debian/makefile deleted file mode 100644 index 25bc0350c..000000000 --- a/vendor/debian/makefile +++ /dev/null @@ -1,17 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=vendor/debian - -# Bring in the default rules -include ../../buildlib/defaults.mak - -doc binary manpages: sources.list - -sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ - -clean: clean/sources.list - -clean/sources.list: - rm -f sources.list - diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in index 745e32cbe..2e430296a 100644 --- a/vendor/debian/sources.list.in +++ b/vendor/debian/sources.list.in @@ -1,8 +1,8 @@ # See sources.list(5) manpage for more information # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. -deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free -deb http://security.debian.org &stable-codename;/updates main contrib non-free +deb http://ftp.us.debian.org/debian &debian-stable-codename; main contrib non-free +deb http://security.debian.org &debian-stable-codename;/updates main contrib non-free # Uncomment if you want the apt-get source function to work -#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free -#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free +#deb-src http://ftp.us.debian.org/debian &debian-stable-codename; main contrib non-free +#deb-src http://security.debian.org &debian-stable-codename;/updates main contrib non-free diff --git a/vendor/getinfo b/vendor/getinfo index 4422f5d78..d45c0fca2 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -3,6 +3,7 @@ BASEDIR="$(readlink -f "$(dirname $0)")" INFO="$(readlink -f "${BASEDIR}/current/apt-vendor.ent")" +VERBATIM="${BASEDIR}/../doc/apt-verbatim.ent" if [ -z "$INFO" ] || [ ! -e "$INFO" ]; then echo >&2 'The current vendor is not valid or not chosen by the buildsystem yet.' @@ -20,17 +21,20 @@ getfield() { } case "$1" in -debian-stable-codename) - getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" - ;; -tanglu-codename) - getrawfield 'tanglu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" +debian-stable-codename|debian-oldstable-codename|debian-testing-codename) + getrawfield "${1#*-}" "$VERBATIM" ;; ubuntu-codename) - getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + getrawfield "$1" "$VERBATIM" + ;; +keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename) + exec $0 'vendor' "$@" + ;; +vendor) + getfield "$2" ;; -keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename) - getfield "$1" +verbatim) + getfield "$2" "$VERBATIM" ;; *) echo >&2 "Unknown data field $1 requested" diff --git a/vendor/makefile b/vendor/makefile index 619c603fb..0701a03eb 100644 --- a/vendor/makefile +++ b/vendor/makefile @@ -14,11 +14,9 @@ veryclean: veryclean/subdirs dirs: dirs/subdirs manpages: manpages/subdirs -all/subdirs binary/subdirs doc/subdirs dirs/subdirs manpages/subdirs: - $(MAKE) -C current $(patsubst %/subdirs,%,$@) - -clean/subdirs veryclean/subdirs: - test ! -e current || $(MAKE) -C current $(patsubst %/subdirs,%,$@) +all/subdirs binary/subdirs doc/subdirs dirs/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: + test ! -e current/makefile || $(MAKE) -C current $(patsubst %/subdirs,%,$@) + test ! -e current/makefile.auto || $(MAKE) -C current -f makefile.auto $(patsubst %/subdirs,%,$@) current: rm -f $@ @@ -29,17 +27,29 @@ current: break; \ fi; \ done - # if we haven't found a specific, look for a deriving in hardcoded order - test -e $@ || \ - (dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \ - (dpkg-vendor --derives-from tanglu && cp ln -s tanglu $@ ) || \ - ln -s debian $@ + # if we haven't found a specific, look for a deriving + # we do ubuntu and debian last as those are the biggest families + # and would therefore potentially 'shadow' smaller families + # (especially debian as it sorts quiet early) + if ! test -e $@; then \ + find -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do \ + if [ "$$DISTRO" = 'debian' -o "$$DISTRO" = 'ubuntu' ]; then continue; fi; \ + if dpkg-vendor --derives-from $$DISTRO; then \ + ln -s $$DISTRO $@; \ + break; \ + fi; \ + done; \ + test -e $@ || \ + (dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \ + ln -s debian $@; \ + fi + if test ! -e current/makefile; then \ + sed "s#@@VENDOR@@#$(notdir $(shell readlink -f current))#" vendor.makefile > current/makefile.auto; \ + fi .PHONY: clean veryclean all binary vendor -.NOPARALLEL: clean: clean/current -clean/current: - test ! -e current || $(MAKE) -C current clean - rm -f current +clean/current: clean/subdirs + rm -f current/makefile.auto current diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile deleted file mode 100644 index c4464900f..000000000 --- a/vendor/raspbian/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=vendor/raspbian - -# Bring in the default rules -include ../../buildlib/defaults.mak - -doc binary manpages: sources.list - -sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ - -clean: clean/sources.list - -clean/sources.list: - rm -f sources.list diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent index 69bb254ef..dc1b798e6 100644 --- a/vendor/steamos/apt-vendor.ent +++ b/vendor/steamos/apt-vendor.ent @@ -3,6 +3,6 @@ <!ENTITY keyring-package "<package>valve-archive-keyring</package>"> <!ENTITY keyring-filename "<filename>/usr/share/keyrings/valve-archive-keyring.gpg</filename>"> <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/valve-archive-removed-keys.gpg</filename>"> -<!ENTITY current-distro-codename "alchemist"> <!ENTITY keyring-master-filename ""> <!ENTITY keyring-uri ""> +<!ENTITY current-codename "alchemist"> diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile deleted file mode 100644 index 9ee0e65a2..000000000 --- a/vendor/steamos/makefile +++ /dev/null @@ -1,17 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=vendor/steamos - -# Bring in the default rules -include ../../buildlib/defaults.mak - -doc binary manpages: sources.list - -sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@ - -clean: clean/sources.list - -clean/sources.list: - rm -f sources.list - diff --git a/vendor/steamos/sources.list.in b/vendor/steamos/sources.list.in index fed6c3818..69174d090 100644 --- a/vendor/steamos/sources.list.in +++ b/vendor/steamos/sources.list.in @@ -1,5 +1,5 @@ # See sources.list(5) manpage for more information # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. -deb http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free -deb-src http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free +deb http://repo.steampowered.com/steamos ¤t-codename; main contrib non-free +deb-src http://repo.steampowered.com/steamos ¤t-codename; main contrib non-free diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent index 4b70a5f82..d2442209c 100644 --- a/vendor/tanglu/apt-vendor.ent +++ b/vendor/tanglu/apt-vendor.ent @@ -5,3 +5,4 @@ <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/tanglu-archive-removed-keys.gpg</filename>"> <!ENTITY keyring-master-filename ""> <!ENTITY keyring-uri ""> +<!ENTITY current-codename "bartholomea"> diff --git a/vendor/tanglu/makefile b/vendor/tanglu/makefile deleted file mode 100644 index 9fe680bc6..000000000 --- a/vendor/tanglu/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=vendor/tanglu - -# Bring in the default rules -include ../../buildlib/defaults.mak - -doc binary manpages: sources.list - -sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&tanglu-codename;#$(shell ../getinfo tanglu-codename)#g' $< > $@ - -clean: clean/sources.list - -clean/sources.list: - rm -f sources.list diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in index dfa219046..ce95e70c2 100644 --- a/vendor/tanglu/sources.list.in +++ b/vendor/tanglu/sources.list.in @@ -1,7 +1,7 @@ # See sources.list(5) manpage for more information -deb http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free -#deb-src http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free +deb http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free +#deb-src http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free -#deb http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free -#deb-src http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free +#deb http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free +#deb-src http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile deleted file mode 100644 index afcaaf718..000000000 --- a/vendor/ubuntu/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=vendor/ubuntu - -# Bring in the default rules -include ../../buildlib/defaults.mak - -doc binary manpages: sources.list - -sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ - -clean: clean/sources.list - -clean/sources.list: - rm -f sources.list diff --git a/vendor/vendor.makefile b/vendor/vendor.makefile new file mode 100644 index 000000000..40b35ea3d --- /dev/null +++ b/vendor/vendor.makefile @@ -0,0 +1,21 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/@@VENDOR@@ + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc binary manpages: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&debian-stable-codename;#$(shell ../getinfo debian-stable-codename)#g' \ + -e 's#&debian-oldstable-codename;#$(shell ../getinfo debian-oldstable-codename)#g' \ + -e 's#&debian-testing-codename;#$(shell ../getinfo debian-testing-codename)#g' \ + -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' \ + -e 's#¤t-codename;#$(shell ../getinfo current-codename)#g' \ + $< > $@ + +clean: clean/sources.list + +clean/sources.list: + rm -f sources.list -- cgit v1.2.3 From a5414e56403537678d5be87acf59c37a05f55719 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 24 Feb 2014 23:10:25 +0100 Subject: add default and override handling for Cnf::FindVector Automatically handle the override of list options via its parent value which can even be a comma-separated list of values. It also adds an easy way of providing a default for the list. --- apt-pkg/aptconfiguration.cc | 72 ++++++--------------------------------- apt-pkg/contrib/configuration.cc | 14 ++++++-- apt-pkg/contrib/configuration.h | 16 ++++++++- apt-pkg/contrib/strutl.cc | 4 ++- prepare-release | 1 + test/libapt/configuration_test.cc | 34 ++++++++++++++++-- test/libapt/getlanguages_test.cc | 8 +++++ 7 files changed, 81 insertions(+), 68 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 0b0b546c5..f5c758e14 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -49,11 +49,6 @@ const Configuration::getCompressionTypes(bool const &Cached) { setDefaultConfigurationForCompressors(); std::vector<APT::Configuration::Compressor> const compressors = getCompressors(); - // accept non-list order as override setting for config settings on commandline - std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order",""); - if (overrideOrder.empty() == false) - types.push_back(overrideOrder); - // load the order setting into our vector std::vector<std::string> const order = _config->FindVector("Acquire::CompressionTypes::Order"); for (std::vector<std::string>::const_iterator o = order.begin(); @@ -227,61 +222,11 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, } } } else { + // cornercase: LANG=C, so we use only "en" Translation environment.push_back("en"); } - // Support settings like Acquire::Languages=none on the command line to - // override the configuration settings vector of languages. - string const forceLang = _config->Find("Acquire::Languages",""); - if (forceLang.empty() == false) { - if (forceLang == "none") { - codes.clear(); - allCodes.clear(); - allCodes.push_back("none"); - } else { - if (forceLang == "environment") - codes = environment; - else - codes.push_back(forceLang); - allCodes = codes; - for (std::vector<string>::const_iterator b = builtin.begin(); - b != builtin.end(); ++b) - if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) - allCodes.push_back(*b); - } - if (All == true) - return allCodes; - else - return codes; - } - - // cornercase: LANG=C, so we use only "en" Translation - if (envShort == "C") { - allCodes = codes = environment; - allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); - if (All == true) - return allCodes; - else - return codes; - } - - std::vector<string> const lang = _config->FindVector("Acquire::Languages"); - // the default setting -> "environment, en" - if (lang.empty() == true) { - codes = environment; - if (envShort != "en") - codes.push_back("en"); - allCodes = codes; - for (std::vector<string>::const_iterator b = builtin.begin(); - b != builtin.end(); ++b) - if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) - allCodes.push_back(*b); - if (All == true) - return allCodes; - else - return codes; - } - + std::vector<string> const lang = _config->FindVector("Acquire::Languages", "environment,en"); // the configs define the order, so add the environment // then needed and ensure the codes are not listed twice. bool noneSeen = false; @@ -308,10 +253,15 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, allCodes.push_back(*l); } - for (std::vector<string>::const_iterator b = builtin.begin(); - b != builtin.end(); ++b) - if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) - allCodes.push_back(*b); + if (allCodes.empty() == false) { + for (std::vector<string>::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + } else { + // "none" was forced + allCodes.push_back("none"); + } if (All == true) return allCodes; diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 4ef4663c0..8eddd56d4 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -21,6 +21,7 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/init.h> #include <vector> #include <fstream> @@ -246,12 +247,18 @@ string Configuration::FindDir(const char *Name,const char *Default) const // Configuration::FindVector - Find a vector of values /*{{{*/ // --------------------------------------------------------------------- /* Returns a vector of config values under the given item */ -vector<string> Configuration::FindVector(const char *Name) const +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) +vector<string> Configuration::FindVector(const char *Name) const { return FindVector(Name, ""); } +#endif +vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const { vector<string> Vec; const Item *Top = Lookup(Name); if (Top == NULL) - return Vec; + return VectorizeString(Default, ','); + + if (Top->Value.empty() == false) + return VectorizeString(Top->Value, ','); Item *I = Top->Child; while(I != NULL) @@ -259,6 +266,9 @@ vector<string> Configuration::FindVector(const char *Name) const Vec.push_back(I->Value); I = I->Next; } + if (Vec.empty() == true) + return VectorizeString(Default, ','); + return Vec; } /*}}}*/ diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 8e09ea0a6..c256139f4 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -74,8 +74,22 @@ class Configuration std::string Find(std::string const &Name, std::string const &Default) const {return Find(Name.c_str(),Default.c_str());}; std::string FindFile(const char *Name,const char *Default = 0) const; std::string FindDir(const char *Name,const char *Default = 0) const; + /** return a list of child options + * + * Options like Acquire::Languages are handled as lists which + * can be overridden and have a default. For the later two a comma + * separated list of values is supported. + * + * \param Name of the parent node + * \param Default list of values separated by commas */ + std::vector<std::string> FindVector(const char *Name, std::string const &Default) const; + std::vector<std::string> FindVector(std::string const &Name, std::string const &Default) const { return FindVector(Name.c_str(), Default); }; +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + std::vector<std::string> FindVector(const char *Name) const { return FindVector(Name, ""); }; +#else std::vector<std::string> FindVector(const char *Name) const; - std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str()); }; +#endif + std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str(), ""); }; int FindI(const char *Name,int const &Default = 0) const; int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);}; bool FindB(const char *Name,bool const &Default = false) const; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index d4f53ea3a..f8bb3890d 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1130,9 +1130,11 @@ bool TokSplitString(char Tok,char *Input,char **List, also, but the advantage is that we have an iteratable vector */ vector<string> VectorizeString(string const &haystack, char const &split) { + vector<string> exploded; + if (haystack.empty() == true) + return exploded; string::const_iterator start = haystack.begin(); string::const_iterator end = start; - vector<string> exploded; do { for (; end != haystack.end() && *end != split; ++end); exploded.push_back(string(start, end)); diff --git a/prepare-release b/prepare-release index 6141ce6e4..6229ee1fd 100755 --- a/prepare-release +++ b/prepare-release @@ -1,6 +1,7 @@ #!/bin/sh set -e +cd "$(readlink -f $(dirname $0))" dpkg-checkbuilddeps -d 'libxml2-utils' if [ -n "${GBP_BUILD_DIR}" ]; then diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc index 2c974ee0a..957e905d5 100644 --- a/test/libapt/configuration_test.cc +++ b/test/libapt/configuration_test.cc @@ -98,9 +98,37 @@ int main(int argc,const char *argv[]) { equals(Cnf.FindDir("Dir::State"), "/rootdir/dev/null"); equals(Cnf.FindDir("Dir::State::lists"), "/rootdir/dev/null"); - Cnf.Set("Moo::Bar", "1"); - Cnf.Clear(); - equals(Cnf.Find("Moo::Bar"), ""); + Cnf.Set("Moo::Bar", "1"); + Cnf.Clear(); + equals(Cnf.Find("Moo::Bar"), ""); + + std::vector<std::string> vec = Cnf.FindVector("Test::Vector", ""); + equals(vec.size(), 0); + vec = Cnf.FindVector("Test::Vector", "foo"); + equals(vec.size(), 1); + equals(vec[0], "foo"); + vec = Cnf.FindVector("Test::Vector", "foo,bar"); + equals(vec.size(), 2); + equals(vec[0], "foo"); + equals(vec[1], "bar"); + Cnf.Set("Test::Vector::", "baz"); + Cnf.Set("Test::Vector::", "bob"); + Cnf.Set("Test::Vector::", "dob"); + vec = Cnf.FindVector("Test::Vector"); + equals(vec.size(), 3); + equals(vec[0], "baz"); + equals(vec[1], "bob"); + equals(vec[2], "dob"); + vec = Cnf.FindVector("Test::Vector", "foo,bar"); + equals(vec.size(), 3); + equals(vec[0], "baz"); + equals(vec[1], "bob"); + equals(vec[2], "dob"); + Cnf.Set("Test::Vector", "abel,bravo"); + vec = Cnf.FindVector("Test::Vector", "foo,bar"); + equals(vec.size(), 2); + equals(vec[0], "abel"); + equals(vec[1], "bravo"); //FIXME: Test for configuration file parsing; // currently only integration/ tests test them implicitly diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index cef89bde6..51cfecee3 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -105,6 +105,14 @@ int main(int argc,char *argv[]) vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 1); equals(vec[0], "fr"); + + _config->Set("Acquire::Languages", "environment,en"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 3); + equals(vec[0], "de_DE"); + equals(vec[1], "de"); + equals(vec[2], "en"); _config->Set("Acquire::Languages", ""); _config->Set("Acquire::Languages::1", "environment"); -- cgit v1.2.3 From 565ded7b65240b25ad8551789ac388c8ce72b1f4 Mon Sep 17 00:00:00 2001 From: Johannes Schauer <j.schauer@email.de> Date: Tue, 25 Feb 2014 00:12:20 +0100 Subject: implement BuildProfileSpec support as dpkg has in 1.17.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Build-dependencies are now able to include a <profile.foo …> specification limiting usage similar to already supported [arch …]. More details: https://wiki.debian.org/BuildProfileSpec Closes: 661537 --- apt-pkg/deb/deblistparser.cc | 91 ++++++++++++++++++++++++++++++++++++++-- apt-pkg/deb/deblistparser.h | 17 ++++++-- apt-pkg/deb/debsrcrecords.cc | 2 +- test/libapt/parsedepends_test.cc | 88 ++++++++++++++++++++++++++------------ 4 files changed, 162 insertions(+), 36 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index acdcc4554..a4795f15d 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -474,18 +474,31 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) // --------------------------------------------------------------------- /* This parses the dependency elements out of a standard string in place, bit by bit. */ +const char *debListParser::ParseDepends(const char *Start,const char *Stop, + std::string &Package,std::string &Ver,unsigned int &Op) + { return ParseDepends(Start, Stop, Package, Ver, Op, false, true, false); } +const char *debListParser::ParseDepends(const char *Start,const char *Stop, + std::string &Package,std::string &Ver,unsigned int &Op, + bool const &ParseArchFlags) + { return ParseDepends(Start, Stop, Package, Ver, Op, ParseArchFlags, true, false); } +const char *debListParser::ParseDepends(const char *Start,const char *Stop, + std::string &Package,std::string &Ver,unsigned int &Op, + bool const &ParseArchFlags, bool const &StripMultiArch) + { return ParseDepends(Start, Stop, Package, Ver, Op, ParseArchFlags, StripMultiArch, false); } const char *debListParser::ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver, unsigned int &Op, bool const &ParseArchFlags, - bool const &StripMultiArch) + bool const &StripMultiArch, + bool const &ParseRestrictionsList) { // Strip off leading space - for (;Start != Stop && isspace(*Start) != 0; Start++); + for (;Start != Stop && isspace(*Start) != 0; ++Start); // Parse off the package name const char *I = Start; for (;I != Stop && isspace(*I) == 0 && *I != '(' && *I != ')' && - *I != ',' && *I != '|' && *I != '[' && *I != ']'; I++); + *I != ',' && *I != '|' && *I != '[' && *I != ']' && + *I != '<' && *I != '>'; ++I); // Malformed, no '(' if (I != Stop && *I == ')') @@ -602,6 +615,76 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, for (;I != Stop && isspace(*I) != 0; I++); } + if (ParseRestrictionsList == true) + { + // Parse a restrictions list + if (I != Stop && *I == '<') + { + ++I; + // malformed + if (unlikely(I == Stop)) + return 0; + + std::vector<string> const profiles = _config->FindVector("APT::Build-Profiles"); + + const char *End = I; + bool Found = false; + bool NegRestriction = false; + while (I != Stop) + { + // look for whitespace or ending '>' + for (;End != Stop && !isspace(*End) && *End != '>'; ++End); + + if (unlikely(End == Stop)) + return 0; + + if (*I == '!') + { + NegRestriction = true; + ++I; + } + + std::string restriction(I, End); + + std::string prefix = "profile."; + // only support for "profile" prefix, ignore others + if (restriction.size() > prefix.size() && + restriction.substr(0, prefix.size()) == prefix) + { + // get the name of the profile + restriction = restriction.substr(prefix.size()); + + if (restriction.empty() == false && profiles.empty() == false && + std::find(profiles.begin(), profiles.end(), restriction) != profiles.end()) + { + Found = true; + if (I[-1] != '!') + NegRestriction = false; + // we found a match, so fast-forward to the end of the wildcards + for (; End != Stop && *End != '>'; ++End); + } + } + + if (*End++ == '>') { + I = End; + break; + } + + I = End; + for (;I != Stop && isspace(*I) != 0; I++); + } + + if (NegRestriction == true) + Found = !Found; + + if (Found == false) + Package = ""; /* not for this restriction */ + } + + // Skip whitespace + for (;I != Stop && isspace(*I) != 0; I++); + } + if (I != Stop && *I == '|') Op |= pkgCache::Dep::Or; @@ -635,7 +718,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, string Version; unsigned int Op; - Start = ParseDepends(Start, Stop, Package, Version, Op, false, false); + Start = ParseDepends(Start, Stop, Package, Version, Op, false, false, false); if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); size_t const found = Package.rfind(':'); diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 386d291a2..0531b20f3 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -72,11 +72,20 @@ class debListParser : public pkgCacheGenerator::ListParser bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File, std::string section); - + + static const char *ParseDepends(const char *Start,const char *Stop, + std::string &Package,std::string &Ver,unsigned int &Op); static const char *ParseDepends(const char *Start,const char *Stop, - std::string &Package,std::string &Ver,unsigned int &Op, - bool const &ParseArchFlags = false, - bool const &StripMultiArch = true); + std::string &Package,std::string &Ver,unsigned int &Op, + bool const &ParseArchFlags); + static const char *ParseDepends(const char *Start,const char *Stop, + std::string &Package,std::string &Ver,unsigned int &Op, + bool const &ParseArchFlags, bool const &StripMultiArch); + static const char *ParseDepends(const char *Start,const char *Stop, + std::string &Package,std::string &Ver,unsigned int &Op, + bool const &ParseArchFlags, bool const &StripMultiArch, + bool const &ParseRestrictionsList); + static const char *ConvertRelation(const char *I,unsigned int &Op); debListParser(FileFd *File, std::string const &Arch = ""); diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index ce55ccd1f..90182b4a4 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -90,7 +90,7 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe while (1) { Start = debListParser::ParseDepends(Start, Stop, - rec.Package,rec.Version,rec.Op,true, StripMultiArch); + rec.Package,rec.Version,rec.Op,true,StripMultiArch,true); if (Start == 0) return _error->Error("Problem parsing dependency: %s", fields[I]); diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index e95016240..67dbab823 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -10,7 +10,9 @@ int main(int argc,char *argv[]) { unsigned int Null = 0; bool StripMultiArch = true; bool ParseArchFlags = false; + bool ParseRestrictionsList = false; _config->Set("APT::Architecture","amd64"); + _config->Set("APT::Build-Profiles","stage1"); const char* Depends = "debhelper:any (>= 5.0), " @@ -27,6 +29,9 @@ int main(int argc,char *argv[]) { "os-for-me [ linux-any ], " "cpu-not-for-me [ any-armel ], " "os-not-for-me [ kfreebsd-any ], " + "not-in-stage1 <!profile.stage1>, " + "not-in-stage1-or-nodoc <!profile.nodoc !profile.stage1>, " + "only-in-stage1 <unknown.unknown profile.stage1>, " "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), " ; @@ -39,7 +44,7 @@ test: const char* Start = Depends; const char* End = Depends + strlen(Depends); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); if (StripMultiArch == true) equals("debhelper", Package); else @@ -47,7 +52,7 @@ test: equals("5.0", Version); equals(Null | pkgCache::Dep::GreaterEq, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); if (StripMultiArch == true) equals("libdb-dev", Package); else @@ -55,7 +60,7 @@ test: equals("", Version); equals(Null | pkgCache::Dep::NoOp, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); if (StripMultiArch == true) equals("gettext", Package); else @@ -63,7 +68,7 @@ test: equals("0.12", Version); equals(Null | pkgCache::Dep::LessEq, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); if (StripMultiArch == true) equals("libcurl4-gnutls-dev", Package); else @@ -71,104 +76,131 @@ test: equals("", Version); equals(Null | pkgCache::Dep::Or, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("libcurl3-gnutls-dev", Package); equals("7.15.5", Version); equals(Null | pkgCache::Dep::Greater, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("debiandoc-sgml", Package); equals("", Version); equals(Null | pkgCache::Dep::NoOp, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("apt", Package); equals("0.7.25", Version); equals(Null | pkgCache::Dep::GreaterEq, Op); if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("", Package); // not-for-me } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("only-for-me", Package); equals("", Version); equals(Null | pkgCache::Dep::NoOp, Op); } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("any-for-me", Package); equals("", Version); equals(Null | pkgCache::Dep::NoOp, Op); } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("not-for-darwin", Package); equals("", Version); equals(Null | pkgCache::Dep::NoOp, Op); } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("cpu-for-me", Package); equals("", Version); equals(Null | pkgCache::Dep::NoOp, Op); } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("os-for-me", Package); equals("", Version); equals(Null | pkgCache::Dep::NoOp, Op); } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("", Package); // cpu-not-for-me } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); equals("", Package); // os-not-for-me } else { - equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); Start = strstr(Start, ","); Start++; } - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (ParseRestrictionsList == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + equals("", Package); // not-in-stage1 + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseRestrictionsList == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + equals("", Package); // not-in-stage1-or-in-nodoc + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseRestrictionsList == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + equals("only-in-stage1", Package); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + Start = strstr(Start, ","); + Start++; + } + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); if (StripMultiArch == true) equals("overlord-dev", Package); else @@ -176,7 +208,7 @@ test: equals("7.15.3~", Version); equals(Null | pkgCache::Dep::Equals | pkgCache::Dep::Or, Op); - debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); if (StripMultiArch == true) equals("overlord-dev", Package); else @@ -185,11 +217,13 @@ test: equals(Null | pkgCache::Dep::Greater, Op); if (StripMultiArch == false) - ParseArchFlags = true; + if (ParseArchFlags == false) + ParseRestrictionsList = !ParseRestrictionsList; + ParseArchFlags = !ParseArchFlags; StripMultiArch = !StripMultiArch; runner++; - if (runner < 4) + if (runner < 8) goto test; // this is the prove: tests are really evil ;) return 0; -- cgit v1.2.3 From ce7f128c020e1347f91c6074238fc5da58c5df71 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Tue, 25 Feb 2014 14:26:18 +0100 Subject: support DEB_BUILD_PROFILES and -P for build profiles Inspired by the rest of the patch in 661537, but abstract the parsing of various ways of setting the build profiles more so it can potentially be reused and all apt parts have the same behaviour. Especially config options, cmdline options and environment will not be combined as proposed as this isn't APTs usual behaviour and dpkg doesn't do it either, so one overrides the other as it normally does. --- apt-pkg/aptconfiguration.cc | 26 +++- apt-pkg/aptconfiguration.h | 5 + apt-pkg/deb/deblistparser.cc | 2 +- apt-private/private-cmndline.cc | 2 + cmdline/apt-config.cc | 5 + cmdline/apt-get.cc | 6 + debian/control | 2 +- doc/apt-get.8.xml | 13 +- doc/apt.conf.5.xml | 9 ++ test/integration/framework | 6 + .../test-bug-661537-build-profiles-support | 147 +++++++++++++++++++++ 11 files changed, 219 insertions(+), 4 deletions(-) create mode 100755 test/integration/test-bug-661537-build-profiles-support diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index f5c758e14..3948854c6 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -426,7 +426,7 @@ void Configuration::setDefaultConfigurationForCompressors() { } } /*}}}*/ -// getCompressors - Return Vector of usbale compressors /*{{{*/ +// getCompressors - Return Vector of usealbe compressors /*{{{*/ // --------------------------------------------------------------------- /* return a vector of compressors used by apt-ftparchive in the multicompress functionality or to detect data.tar files */ @@ -508,4 +508,28 @@ Configuration::Compressor::Compressor(char const *name, char const *extension, UncompressArgs.push_back(uncompressArg); } /*}}}*/ +// getBuildProfiles - return a vector of enabled build profiles /*{{{*/ +std::vector<std::string> const Configuration::getBuildProfiles() { + // order is: override value (~= commandline), environment variable, list (~= config file) + std::string profiles_env = getenv("DEB_BUILD_PROFILES") == 0 ? "" : getenv("DEB_BUILD_PROFILES"); + if (profiles_env.empty() == false) { + profiles_env = SubstVar(profiles_env, " ", ","); + std::string const bp = _config->Find("APT::Build-Profiles"); + _config->Clear("APT::Build-Profiles"); + if (bp.empty() == false) + _config->Set("APT::Build-Profiles", bp); + } + return _config->FindVector("APT::Build-Profiles", profiles_env); +} +std::string const Configuration::getBuildProfilesString() { + std::vector<std::string> profiles = getBuildProfiles(); + if (profiles.empty() == true) + return ""; + std::vector<std::string>::const_iterator p = profiles.begin(); + std::string list = *p; + for (; p != profiles.end(); ++p) + list.append(",").append(*p); + return list; +} + /*}}}*/ } diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index bf7deae85..026493c6d 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -117,6 +117,11 @@ public: /*{{{*/ /** \brief Return a vector of extensions supported for data.tar's */ std::vector<std::string> static const getCompressorExtensions(); + + /** \return Return a vector of enabled build profile specifications */ + std::vector<std::string> static const getBuildProfiles(); + /** \return Return a comma-separated list of enabled build profile specifications */ + std::string static const getBuildProfilesString(); /*}}}*/ private: /*{{{*/ void static setDefaultConfigurationForCompressors(); diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index a4795f15d..89f3514c9 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -625,7 +625,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, if (unlikely(I == Stop)) return 0; - std::vector<string> const profiles = _config->FindVector("APT::Build-Profiles"); + std::vector<string> const profiles = APT::Configuration::getBuildProfiles(); const char *End = I; bool Found = false; diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index ef7d65f3c..b99443210 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -141,6 +141,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const { addArg('b', "compile", "APT::Get::Compile", 0); addArg('b', "build", "APT::Get::Compile", 0); + addArg('P', "build-profiles", "APT::Build-Profiles", CommandLine::HasArg); addArg(0, "diff-only", "APT::Get::Diff-Only", 0); addArg(0, "debian-only", "APT::Get::Diff-Only", 0); addArg(0, "tar-only", "APT::Get::Tar-Only", 0); @@ -149,6 +150,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const else if (CmdMatches("build-dep")) { addArg('a', "host-architecture", "APT::Get::Host-Architecture", CommandLine::HasArg); + addArg('P', "build-profiles", "APT::Build-Profiles", CommandLine::HasArg); addArg(0, "purge", "APT::Get::Purge", 0); addArg(0, "solver", "APT::Solver", CommandLine::HasArg); // this has no effect *but* sbuild is using it (see LP: #1255806) diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 30c2a22d5..9f20b3c1b 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -155,6 +155,11 @@ int main(int argc,const char *argv[]) /*{{{*/ _config->Set(comp + "UncompressArg::", *a); } + std::vector<std::string> const profiles = APT::Configuration::getBuildProfiles(); + _config->Clear("APT::Build-Profiles"); + for (std::vector<std::string>::const_iterator p = profiles.begin(); p != profiles.end(); ++p) + _config->Set("APT::Build-Profiles::", *p); + // Match the operation CmdL.DispatchArg(Cmds); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 12e385b69..f8de80a91 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -970,6 +970,12 @@ bool DoSource(CommandLine &CmdL) string buildopts = _config->Find("APT::Get::Host-Architecture"); if (buildopts.empty() == false) buildopts = "-a" + buildopts + " "; + + // get all active build profiles + std::string const profiles = APT::Configuration::getBuildProfilesString(); + if (profiles.empty() == false) + buildopts.append(" -P").append(profiles).append(" "); + buildopts.append(_config->Find("DPkg::Build-Options","-b -uc")); // Call dpkg-buildpackage diff --git a/debian/control b/debian/control index 2d58d0711..5ce68414e 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Conflicts: python-apt (<< 0.7.93.2~) -Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, python-apt +Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt Description: commandline package manager This package provides commandline tools for searching and managing as well as querying information about packages diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 595ea875d..1ed08904e 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -371,7 +371,18 @@ by <command>apt-get source --compile</command> and how cross-builddependencies are satisfied. By default is it not set which means that the host architecture is the same as the build architecture (which is defined by <literal>APT::Architecture</literal>). - Configuration Item: <literal>APT::Get::Host-Architecture</literal> + Configuration Item: <literal>APT::Get::Host-Architecture</literal>. + </para></listitem> + </varlistentry> + + <varlistentry><term><option>-P</option></term> + <term><option>--build-profiles</option></term> + <listitem><para>This option controls the activated build profiles for which + a source package is built by <command>apt-get source --compile</command> and + how build dependencies are satisfied. By default no build profile is active. + More than one build profile can be activated at a time by concatenating them + with a comma. + Configuration Item: <literal>APT::Build-Profiles</literal>. </para></listitem> </varlistentry> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index bfc43ba29..78f6a27a2 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -177,6 +177,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </para></listitem> </varlistentry> + <varlistentry><term><option>Build-Profiles</option></term> + <listitem><para> + List of all build profiles enabled for build-dependency resolution, + without the "<literal>profile.</literal>" namespace prefix. + By default this list is empty. The <envar>DEB_BUILD_PROFILES</envar> + as used by &dpkg-buildpackage; overrides the list notation. + </para></listitem> + </varlistentry> + <varlistentry><term><option>Default-Release</option></term> <listitem><para>Default release to install packages from if more than one version is available. Contains release name, codename or release version. Examples: 'stable', 'testing', diff --git a/test/integration/framework b/test/integration/framework index 911a4d742..9c4ac87d3 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -120,6 +120,9 @@ aptwebserver() { dpkg() { command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" } +dpkgcheckbuilddeps() { + command dpkg-checkbuilddeps --admindir=${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg "$@" +} aptitude() { if [ -f ./aptconfig.conf ]; then APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" @@ -240,6 +243,9 @@ setupenvironment() { # newer gpg versions are fine without it, but play it safe for now gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1 + # cleanup the environment a bit + unset GREP_OPTIONS DEB_BUILD_PROFILES + msgdone "info" } diff --git a/test/integration/test-bug-661537-build-profiles-support b/test/integration/test-bug-661537-build-profiles-support new file mode 100755 index 000000000..ae1403f71 --- /dev/null +++ b/test/integration/test-bug-661537-build-profiles-support @@ -0,0 +1,147 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' 'armel' + +insertinstalledpackage 'build-essential' 'all' '0' 'Multi-Arch: foreign' + +insertpackage 'unstable' 'foo' 'all' '1.0' +insertpackage 'unstable' 'bar' 'all' '1.0' + +insertsource 'unstable' 'buildprofiles' 'any' '1' 'Build-Depends: foo (>= 1.0) [i386 arm] <!profile.stage1 !profile.cross>, bar' + +# table from https://wiki.debian.org/BuildProfileSpec +insertsource 'unstable' 'spec-1' 'any' '1' 'Build-Depends: foo <!profile.stage1>' +insertsource 'unstable' 'spec-2' 'any' '1' 'Build-Depends: foo <profile.stage1>' +insertsource 'unstable' 'spec-3' 'any' '1' 'Build-Depends: foo <!profile.stage1 !profile.notest>' +insertsource 'unstable' 'spec-4' 'any' '1' 'Build-Depends: foo <profile.stage1 profile.notest>' +insertsource 'unstable' 'spec-5' 'any' '1' 'Build-Depends: foo <!profile.stage1 profile.notest>' +insertsource 'unstable' 'spec-6' 'any' '1' 'Build-Depends: foo <profile.stage1 !profile.notest>' +# multiple stanzas not supported: error out +insertsource 'unstable' 'spec-7' 'any' '1' 'Build-Depends: foo <profile.stage1><!profile.notest>' +insertsource 'unstable' 'spec-8' 'any' '1' 'Build-Depends: foo <profile.stage1> <!profile.notest>' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + bar +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [all]) +Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + bar foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [all]) +Inst foo (1.0 unstable [all]) +Conf bar (1.0 unstable [all]) +Conf foo (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=i386 + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + bar +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [all]) +Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=armel + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + bar +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [all]) +Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=i386 -P stage1 + +KEEP='Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 unstable [all]) +Conf foo (1.0 unstable [all])' +DROP='Reading package lists... +Building dependency tree... +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' + +msgtest 'Check if version of installed dpkg is high enough for' 'build profiles support' +if dpkg --compare-versions "$(command dpkg-query --showformat='${Version}' --show dpkg)" 'ge' '1.17.2'; then + msgpass + testwithdpkg() { + msgtest "Test with" "dpkg-checkbuilddeps -d '$1' -P '$2'" + local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwithdpkg.output" + if dpkgcheckbuilddeps -d "$1" -P "$2" /dev/null >$OUTPUT 2>&1; then + if [ "$3" = "$DROP" ]; then + msgpass + else + cat $OUTPUT + msgfail + fi + else + if [ "$3" = "$KEEP" ]; then + msgpass + else + cat $OUTPUT + msgfail + fi + fi + } +else + msgskip + testwithdpkg() { + msgtest "Test with" "dpkg-checkbuilddeps -d '$1' -P '$2'" + msgskip + } +fi + +testprofile() { + if [ -n "$3" ]; then + testequal "$4" aptget build-dep "$1" -s -P "$3" + export DEB_BUILD_PROFILES="$(echo "$3" | tr ',' ' ')" + testequal "$4" aptget build-dep "$1" -s -o with::environment=1 + unset DEB_BUILD_PROFILES + else + testequal "$4" aptget build-dep "$1" -s + fi + testwithdpkg "$2" "$3" "$4" +} + +testprofile 'spec-1' 'foo <!profile.stage1>' '' "$KEEP" +testprofile 'spec-1' 'foo <!profile.stage1>' 'stage1' "$DROP" +testprofile 'spec-1' 'foo <!profile.stage1>' 'notest' "$KEEP" +testprofile 'spec-1' 'foo <!profile.stage1>' 'stage1,notest' "$DROP" + +testprofile 'spec-2' 'foo <profile.stage1>' '' "$DROP" +testprofile 'spec-2' 'foo <profile.stage1>' 'stage1' "$KEEP" +testprofile 'spec-2' 'foo <profile.stage1>' 'notest' "$DROP" +testprofile 'spec-2' 'foo <profile.stage1>' 'stage1,notest' "$KEEP" + +testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' '' "$KEEP" +testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' 'stage1' "$DROP" +testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' 'notest' "$DROP" +testprofile 'spec-3' 'foo <!profile.stage1 !profile.notest>' 'stage1,notest' "$DROP" + +testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' '' "$DROP" +testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' 'stage1' "$KEEP" +testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' 'notest' "$KEEP" +testprofile 'spec-4' 'foo <profile.stage1 profile.notest>' 'stage1,notest' "$KEEP" + +testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' '' "$KEEP" +testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' 'stage1' "$DROP" +testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' 'notest' "$KEEP" +testprofile 'spec-5' 'foo <!profile.stage1 profile.notest>' 'stage1,notest' "$DROP" + +testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' '' "$KEEP" +testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' 'stage1' "$KEEP" +testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' 'notest' "$DROP" +testprofile 'spec-6' 'foo <profile.stage1 !profile.notest>' 'stage1,notest' "$KEEP" + +testfailure aptget build-dep spec-7 -s +testfailure aptget build-dep spec-8 -s -- cgit v1.2.3 From be2337962df21addb8386f4262bde0ed0fbcad86 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Tue, 25 Feb 2014 17:21:44 +0100 Subject: unset LANGUAGE in the testing framework directly Git-Dch: Ignore --- debian/tests/run-tests | 3 --- test/integration/framework | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e03db9b0c..41bafda99 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,9 +2,6 @@ set -e -unset LANGUAGE -export LC_ALL=C - # we need the buildin webserver for the tests if [ ! -e environment.mak ]; then make startup diff --git a/test/integration/framework b/test/integration/framework index 9c4ac87d3..83deafe88 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -226,8 +226,6 @@ setupenvironment() { echo 'quiet::NoUpdate "true";' >> aptconfig.conf echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary - export LC_ALL=C.UTF-8 - export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" configcompression '.' 'gz' #'bz2' 'lzma' 'xz' # gpg needs a trustdb to function, but it can't be invalid (not even empty) @@ -244,6 +242,9 @@ setupenvironment() { gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1 # cleanup the environment a bit + export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" + export LC_ALL=C.UTF-8 + unset LANGUAGE unset GREP_OPTIONS DEB_BUILD_PROFILES msgdone "info" -- cgit v1.2.3 From 255c9e4b74fe677d723c51d3450869ad45ca5463 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Tue, 25 Feb 2014 22:10:40 +0100 Subject: make doxygen more quiet, fix issues and disable latex Git-Dch: Ignore --- apt-pkg/acquire-item.h | 15 ++++++++------- apt-pkg/acquire-worker.h | 4 ++-- apt-pkg/acquire.h | 4 ++-- apt-pkg/cachefilter.h | 2 +- apt-pkg/cacheset.h | 7 +++++-- apt-pkg/contrib/error.h | 4 ++-- apt-pkg/depcache.h | 6 +++--- apt-pkg/pkgcache.h | 8 ++++---- doc/Doxyfile.in | 10 +++++----- 9 files changed, 32 insertions(+), 28 deletions(-) diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 5a1c7979c..0524743c6 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -64,7 +64,7 @@ class pkgAcquire::Item : public WeakPointable /** \brief Insert this item into its owner's queue. * - * \param ItemDesc Metadata about this item (its URI and + * \param Item Metadata about this item (its URI and * description). */ inline void QueueURI(ItemDesc &Item) @@ -79,7 +79,7 @@ class pkgAcquire::Item : public WeakPointable * * \param From The file to be renamed. * - * \param To The new name of #From. If #To exists it will be + * \param To The new name of \a From. If \a To exists it will be * overwritten. */ void Rename(std::string From,std::string To); @@ -115,7 +115,7 @@ class pkgAcquire::Item : public WeakPointable } Status; /** \brief Contains a textual description of the error encountered - * if #Status is #StatError or #StatAuthError. + * if #ItemState is #StatError or #StatAuthError. */ std::string ErrorText; @@ -293,7 +293,6 @@ class pkgAcquire::Item : public WeakPointable /** \brief Rename failed file and set error * * \param state respresenting the error we encountered - * \param errorMsg a message describing the error */ bool RenameOnError(RenameOnErrorState const state); }; @@ -636,7 +635,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item /** \brief Create an index diff item. * * After filling in its basic fields, this invokes Finish(true) if - * #diffs is empty, or QueueNextDiff() otherwise. + * \a diffs is empty, or QueueNextDiff() otherwise. * * \param Owner The pkgAcquire object that owns this item. * @@ -651,6 +650,8 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item * reconstructed package index file; the index file will be tested * against this value when it is entirely reconstructed. * + * \param ServerSha1 is the sha1sum of the current file on the server + * * \param diffs The remaining diffs from the index of diffs. They * should be ordered so that each diff appears before any diff * that depends on it. @@ -1162,8 +1163,8 @@ class pkgAcqFile : public pkgAcquire::Item * \param IsIndexFile The file is considered a IndexFile and cache-control * headers like "cache-control: max-age=0" are send * - * If DestFilename is empty, download to DestDir/<basename> if - * DestDir is non-empty, $CWD/<basename> otherwise. If + * If DestFilename is empty, download to DestDir/\<basename\> if + * DestDir is non-empty, $CWD/\<basename\> otherwise. If * DestFilename is NOT empty, DestDir is ignored and DestFilename * is the absolute name to which the file should be downloaded. */ diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index 848a6bad7..a558f69a7 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -136,8 +136,8 @@ class pkgAcquire::Worker : public WeakPointable /** \brief Retrieve any available messages from the subprocess. * - * The messages are retrieved as in ::ReadMessages(), and - * MessageFailure() is invoked if an error occurs; in particular, + * The messages are retrieved as in \link strutl.h ReadMessages()\endlink, and + * #MethodFailure() is invoked if an error occurs; in particular, * if the pipe to the subprocess dies unexpectedly while a message * is being read. * diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 3d5d7a4b7..2c0b37635 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -282,13 +282,13 @@ class pkgAcquire */ void Shutdown(); - /** \brief Get the first #Worker object. + /** \brief Get the first Worker object. * * \return the first active worker in this download process. */ inline Worker *WorkersBegin() {return Workers;}; - /** \brief Advance to the next #Worker object. + /** \brief Advance to the next Worker object. * * \return the worker immediately following I, or \b NULL if none * exists. diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 34b7d0b46..81ae1383c 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -47,7 +47,7 @@ public: /** \class PackageArchitectureMatchesSpecification \brief matching against architecture specification strings - The strings are of the format <kernel>-<cpu> where either component, + The strings are of the format \<kernel\>-\<cpu\> where either component, or the whole string, can be the wildcard "any" as defined in debian-policy §11.1 "Architecture specification strings". diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index b69d74b8e..ce502d8ca 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -479,14 +479,16 @@ protected: /*{{{*/ /** \brief returns the candidate version of the package \param Cache to be used to query for information - \param Pkg we want the candidate version from this package */ + \param Pkg we want the candidate version from this package + \param helper used in this container instance */ static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); /** \brief returns the installed version of the package \param Cache to be used to query for information - \param Pkg we want the installed version from this package */ + \param Pkg we want the installed version from this package + \param helper used in this container instance */ static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); /*}}}*/ @@ -558,6 +560,7 @@ public: /*{{{*/ non specifically requested and executes regex's if needed on names. \param Cache the packages and versions are in \param cmdline Command line the versions should be extracted from + \param fallback version specification \param helper responsible for error and message handling */ static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline, Version const &fallback, CacheSetHelper &helper) { diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index bcee70b1a..c06e45ee4 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -232,11 +232,11 @@ public: /*{{{*/ * if you want to check if also no notices happened set the parameter * flag to \b false. * - * \param WithoutNotice does notices count, default is \b true, so no + * \param threshold minimim level considered * * \return \b true if an the list is empty, \b false otherwise */ - bool empty(MsgType const &trashhold = WARNING) const; + bool empty(MsgType const &threshold = WARNING) const; /** \brief returns and removes the first (or last) message in the list * diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index f6848f383..a02a86b87 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -381,8 +381,8 @@ class pkgDepCache : protected pkgCache::Namespace /** \brief Update the Marked and Garbage fields of all packages. * * This routine is implicitly invoked after all state manipulators - * and when an ActionGroup is destroyed. It invokes #MarkRequired - * and #Sweep to do its dirty work. + * and when an ActionGroup is destroyed. It invokes the private + * MarkRequired() and Sweep() to do its dirty work. * * \param rootFunc A predicate that returns \b true for packages * that should be added to the root set. @@ -465,7 +465,7 @@ class pkgDepCache : protected pkgCache::Namespace * * The parameters are the same as in the calling MarkDelete: * \param Pkg the package that MarkDelete wants to remove. - * \param Purge should we purge instead of "only" remove? + * \param MarkPurge should we purge instead of "only" remove? * \param Depth recursive deep of this Marker call * \param FromUser was the remove requested by the user? */ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index c31c5f30b..669904c84 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -451,7 +451,7 @@ struct pkgCache::PackageFile /** \brief Modification time for the file */ time_t mtime; - /* @TODO document PackageFile::Flags */ + /** @TODO document PackageFile::Flags */ unsigned long Flags; // Linked list @@ -474,7 +474,7 @@ struct pkgCache::VerFile map_ptrloc NextFile; // PkgVerFile /** \brief position in the package file */ map_ptrloc Offset; // File offset - /* @TODO document pkgCache::VerFile::Size */ + /** @TODO document pkgCache::VerFile::Size */ unsigned long Size; }; /*}}}*/ @@ -488,7 +488,7 @@ struct pkgCache::DescFile map_ptrloc NextFile; // PkgVerFile /** \brief position in the file */ map_ptrloc Offset; // File offset - /* @TODO document pkgCache::DescFile::Size */ + /** @TODO document pkgCache::DescFile::Size */ unsigned long Size; }; /*}}}*/ @@ -571,7 +571,7 @@ struct pkgCache::Description and to check that the Translation is up-to-date. */ map_ptrloc md5sum; // StringItem - /* @TODO document pkgCache::Description::FileList */ + /** @TODO document pkgCache::Description::FileList */ map_ptrloc FileList; // DescFile /** \brief next translation for this description */ map_ptrloc NextDesc; // Description diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 306bab1dc..ffd7c88b9 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -40,7 +40,7 @@ PROJECT_NUMBER = @PACKAGE_VERSION@ # for a project that appears at the top of each page and should give viewer # a quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = +PROJECT_BRIEF = "commandline package manager" # With the PROJECT_LOGO tag one can specify an logo or icon that is # included in the documentation. The maximum height of the logo should not @@ -197,7 +197,7 @@ TAB_SIZE = 8 # will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = "TODO=\todo" # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding @@ -601,7 +601,7 @@ CITE_BIB_FILES = # The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. -QUIET = NO +QUIET = YES # The WARNINGS tag can be used to turn on/off the warning messages that are # generated by doxygen. Possible values are YES and NO. If left blank @@ -748,7 +748,7 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. -INPUT_FILTER = +INPUT_FILTER = "sed -e 's#//[ ]*FIXME:\?#/// \\todo#'" # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. @@ -1287,7 +1287,7 @@ EXTRA_SEARCH_MAPPINGS = # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. -GENERATE_LATEX = YES +GENERATE_LATEX = NO # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be -- cgit v1.2.3 From 67c3067f1a615fd6ff0b332c2a526d052442913d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Tue, 25 Feb 2014 22:22:41 +0100 Subject: fix -Wmissing-field-initializers warnings Reported-By: gcc Git-Dch: Ignore --- apt-pkg/deb/deblistparser.cc | 8 ++++---- apt-pkg/indexcopy.cc | 8 ++++---- apt-private/private-show.cc | 26 +++++++++++++------------- cmdline/apt-cache.cc | 2 +- ftparchive/apt-ftparchive.cc | 2 +- methods/ftp.cc | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 89f3514c9..3374865ac 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -34,7 +34,7 @@ static debListParser::WordList PrioList[] = { {"standard",pkgCache::State::Standard}, {"optional",pkgCache::State::Optional}, {"extra",pkgCache::State::Extra}, - {}}; + {NULL, 0}}; // ListParser::debListParser - Constructor /*{{{*/ // --------------------------------------------------------------------- @@ -354,7 +354,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg, {"hold",pkgCache::State::Hold}, {"deinstall",pkgCache::State::DeInstall}, {"purge",pkgCache::State::Purge}, - {}}; + {NULL, 0}}; if (GrabWord(string(Start,I-Start),WantList,Pkg->SelectedState) == false) return _error->Error("Malformed 1st word in the Status line"); @@ -370,7 +370,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg, {"reinstreq",pkgCache::State::ReInstReq}, {"hold",pkgCache::State::HoldInst}, {"hold-reinstreq",pkgCache::State::HoldReInstReq}, - {}}; + {NULL, 0}}; if (GrabWord(string(Start,I-Start),FlagList,Pkg->InstState) == false) return _error->Error("Malformed 2nd word in the Status line"); @@ -392,7 +392,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg, {"triggers-pending",pkgCache::State::TriggersPending}, {"post-inst-failed",pkgCache::State::HalfConfigured}, {"removal-failed",pkgCache::State::HalfInstalled}, - {}}; + {NULL, 0}}; if (GrabWord(string(Start,I-Start),StatusList,Pkg->CurrentState) == false) return _error->Error("Malformed 3rd word in the Status line"); diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 7694cb1dd..9ea244139 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -436,8 +436,8 @@ bool PackageCopy::GetFile(string &File,unsigned long long &Size) /* */ bool PackageCopy::RewriteEntry(FILE *Target,string File) { - TFRewriteData Changes[] = {{"Filename",File.c_str()}, - {}}; + TFRewriteData Changes[] = {{ "Filename", File.c_str(), NULL }, + { NULL, NULL, NULL }}; if (TFRewrite(Target,*Section,TFRewritePackageOrder,Changes) == false) return false; @@ -482,8 +482,8 @@ bool SourceCopy::GetFile(string &File,unsigned long long &Size) bool SourceCopy::RewriteEntry(FILE *Target,string File) { string Dir(File,0,File.rfind('/')); - TFRewriteData Changes[] = {{"Directory",Dir.c_str()}, - {}}; + TFRewriteData Changes[] = {{ "Directory", Dir.c_str(), NULL }, + { NULL, NULL, NULL }}; if (TFRewrite(Target,*Section,TFRewriteSourceOrder,Changes) == false) return false; diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 60d951316..9e4bbd35e 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -96,23 +96,23 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, // FIXME: add verbose that does not do the removal of the tags? TFRewriteData RW[] = { // delete, apt-cache show has this info and most users do not care - {"MD5sum", 0}, - {"SHA1", 0}, - {"SHA256", 0}, - {"Filename", 0}, - {"Multi-Arch", 0}, - {"Architecture", 0}, - {"Conffiles",0}, + {"MD5sum", NULL, NULL}, + {"SHA1", NULL, NULL}, + {"SHA256", NULL, NULL}, + {"Filename", NULL, NULL}, + {"Multi-Arch", NULL, NULL}, + {"Architecture", NULL, NULL}, + {"Conffiles", NULL, NULL}, // we use the translated description - {"Description",0}, - {"Description-md5",0}, + {"Description", NULL, NULL}, + {"Description-md5", NULL, NULL}, // improve - {"Installed-Size", installed_size.c_str(), 0}, + {"Installed-Size", installed_size.c_str(), NULL}, {"Size", package_size.c_str(), "Download-Size"}, // add - {"APT-Manual-Installed", manual_installed, 0}, - {"APT-Sources", source_index_file.c_str(), 0}, - {} + {"APT-Manual-Installed", manual_installed, NULL}, + {"APT-Sources", source_index_file.c_str(), NULL}, + {NULL, NULL, NULL} }; if(TFRewrite(stdout, Tags, NULL, RW) == false) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b8892d23d..22778eb24 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -532,7 +532,7 @@ bool DumpAvail(CommandLine &Cmd) if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource) { pkgTagSection Tags; - TFRewriteData RW[] = {{"Status",0},{"Config-Version",0},{}}; + TFRewriteData RW[] = {{"Status", NULL, NULL},{"Config-Version", NULL, NULL},{NULL, NULL, NULL}}; const char *Zero = 0; if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false || TFRewrite(stdout,Tags,&Zero,RW) == false) diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 712f8469a..d14b68044 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -484,7 +484,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) struct SubstVar const Vars[] = {{"$(DIST)",&Dist}, {"$(SECTION)",&Section}, {"$(ARCH)",&Arch}, - {}}; + {NULL, NULL}}; mode_t const Perms = Block.FindI("FileMode", Permissions); bool const LongDesc = Block.FindB("LongDescription", LongDescription); TranslationWriter *TransWriter; diff --git a/methods/ftp.cc b/methods/ftp.cc index 621f48476..5a87ded1c 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -56,9 +56,9 @@ struct AFMap }; #ifndef AF_INET6 -struct AFMap AFMap[] = {{AF_INET,1},{}}; +struct AFMap AFMap[] = {{AF_INET,1},{0, 0}}; #else -struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{}}; +struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{0, 0}}; #endif unsigned long TimeOut = 120; -- cgit v1.2.3 From 6298ff8b6492e2071a8f2ca7669a3aeef0fb29c7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Tue, 25 Feb 2014 22:30:39 +0100 Subject: fix -Wformat= warnings about size_t != %lu on e.g. armel Git-Dch: Ignore Reported-By: gcc --- apt-private/private-show.cc | 5 +++-- methods/rred.cc | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 9e4bbd35e..0a69debbf 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -148,8 +148,9 @@ bool ShowPackage(CommandLine &CmdL) /*{{{*/ if (select == APT::VersionList::CANDIDATE) { APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper); - if (verset_all.size() > verset.size()) - _error->Notice(ngettext("There is %lu additional record. Please use the '-a' switch to see it", "There are %lu additional records. Please use the '-a' switch to see them.", verset_all.size() - verset.size()), verset_all.size() - verset.size()); + int const records = verset_all.size() - verset.size(); + if (records > 0) + _error->Notice(P_("There is %i additional record. Please use the '-a' switch to see it", "There are %i additional records. Please use the '-a' switch to see them.", records), records); } for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin(); diff --git a/methods/rred.cc b/methods/rred.cc index fe7ef7322..7169fc731 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -469,7 +469,7 @@ class Patch { void write_diff(FILE *f) { - size_t line = 0; + unsigned long long line = 0; std::list<struct Change>::reverse_iterator ch; for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) { line += ch->offset + ch->del_cnt; @@ -482,11 +482,11 @@ class Patch { line -= ch->del_cnt; if (ch->add_cnt > 0) { if (ch->del_cnt == 0) { - fprintf(f, "%lua\n", line); + fprintf(f, "%llua\n", line); } else if (ch->del_cnt == 1) { - fprintf(f, "%luc\n", line+1); + fprintf(f, "%lluc\n", line+1); } else { - fprintf(f, "%lu,%luc\n", line+1, line+ch->del_cnt); + fprintf(f, "%llu,%lluc\n", line+1, line+ch->del_cnt); } mg_i = ch; @@ -496,9 +496,9 @@ class Patch { fprintf(f, ".\n"); } else if (ch->del_cnt == 1) { - fprintf(f, "%lud\n", line+1); + fprintf(f, "%llud\n", line+1); } else if (ch->del_cnt > 1) { - fprintf(f, "%lu,%lud\n", line+1, line+ch->del_cnt); + fprintf(f, "%llu,%llud\n", line+1, line+ch->del_cnt); } line -= ch->offset; } -- cgit v1.2.3 From 27511c011f9ade22e90e90e7acbeb87ba7324a19 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 27 Feb 2014 00:56:11 +0100 Subject: warning: non-ISO-standard escape sequence, '\e' [enabled by default] Git-Dch: Ignore Reported-By: gcc -Wpedantic --- apt-private/private-moo.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc index 9b5b94654..23255db6f 100644 --- a/apt-private/private-moo.cc +++ b/apt-private/private-moo.cc @@ -102,16 +102,16 @@ bool DoMoo2(CommandLine &CmdL) /*{{{*/ else { c1out << - OutputInDepth(depth, " ") << " \e[1;97m(\e[0;33m__\e[1;97m)\e[0m\n" << - OutputInDepth(depth, " ") << " \e[31m_______\e[33m~(\e[1;34m..\e[0;33m)~\e[0m\n" << - OutputInDepth(depth, " ") << " \e[33m,----\e[31m\\\e[33m(\e[1;4;35moo\e[0;33m)\e[0m\n" << - OutputInDepth(depth, " ") << " \e[33m/|____|,'\e[0m\n" << - OutputInDepth(depth, " ") << " \e[1;5;97m*\e[0;33m /\\ /\\\e[0m\n" << - "\e[32m"; + OutputInDepth(depth, " ") << " \033[1;97m(\033[0;33m__\033[1;97m)\033[0m\n" << + OutputInDepth(depth, " ") << " \033[31m_______\033[33m~(\033[1;34m..\033[0;33m)~\033[0m\n" << + OutputInDepth(depth, " ") << " \033[33m,----\033[31m\\\033[33m(\033[1;4;35moo\033[0;33m)\033[0m\n" << + OutputInDepth(depth, " ") << " \033[33m/|____|,'\033[0m\n" << + OutputInDepth(depth, " ") << " \033[1;5;97m*\033[0;33m /\\ /\\\033[0m\n" << + "\033[32m"; for (size_t i = moo.length()/2; i > 1; --i) c1out << "wW"; - c1out << "w\e[0m\n" << moo; + c1out << "w\033[0m\n" << moo; } return true; -- cgit v1.2.3 From d3e8fbb395f57954acd7a2095f02ce530a05ec6a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 27 Feb 2014 01:20:53 +0100 Subject: =?UTF-8?q?warning:=20extra=20=E2=80=98;=E2=80=99=20[-Wpedantic]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-Dch: Ignore Reported-By: gcc -Wpedantic --- apt-inst/filelist.h | 152 +++++++++++++------------- apt-pkg/acquire.cc | 2 +- apt-pkg/cacheiterators.h | 226 +++++++++++++++++++-------------------- apt-pkg/cacheset.h | 176 +++++++++++++++--------------- apt-pkg/cdrom.cc | 6 +- apt-pkg/contrib/configuration.cc | 3 +- apt-pkg/contrib/error.cc | 2 +- apt-pkg/contrib/gpgv.h | 2 +- apt-pkg/contrib/progress.cc | 12 +-- apt-pkg/contrib/strutl.cc | 2 +- apt-pkg/contrib/strutl.h | 38 +++---- apt-pkg/depcache.cc | 4 +- apt-pkg/indexcopy.cc | 4 +- apt-pkg/install-progress.cc | 4 +- apt-pkg/install-progress.h | 32 +++--- apt-pkg/pkgcache.cc | 20 ++-- apt-pkg/pkgcache.h | 42 ++++---- apt-pkg/upgrade.h | 2 +- apt-private/acqprogress.cc | 62 +++++------ cmdline/apt-cdrom.cc | 26 ++--- ftparchive/override.cc | 8 +- methods/cdrom.cc | 2 +- methods/http.cc | 6 +- methods/https.cc | 2 +- methods/mirror.cc | 28 ++--- methods/rsh.cc | 2 +- methods/server.cc | 20 ++-- methods/server.h | 2 +- 28 files changed, 443 insertions(+), 444 deletions(-) diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h index 0405d61df..8c4891bcf 100644 --- a/apt-inst/filelist.h +++ b/apt-inst/filelist.h @@ -42,25 +42,25 @@ class pkgFLCache struct Package; struct Diversion; struct ConfFile; - + class NodeIterator; class DirIterator; class PkgIterator; class DiverIterator; - + protected: std::string CacheFile; DynamicMMap ⤅ map_ptrloc LastTreeLookup; unsigned long LastLookupSize; - + // Helpers for the addition algorithms map_ptrloc TreeLookup(map_ptrloc *Base,const char *Text,const char *TextEnd, unsigned long Size,unsigned int *Count = 0, bool Insert = false); - + public: - + // Pointers to the arrays of items Header *HeaderP; Node *NodeP; @@ -70,10 +70,10 @@ class pkgFLCache ConfFile *ConfP; char *StrP; unsigned char *AnyP; - + // Quick accessors Node *FileHash; - + // Accessors Header &Head() {return *HeaderP;}; void PrintTree(map_ptrloc Base,unsigned long Size); @@ -89,7 +89,7 @@ class pkgFLCache void DropNode(map_ptrloc Node); inline DiverIterator DiverBegin(); - + // Diversion control void BeginDiverLoad(); void FinishDiverLoad(); @@ -97,7 +97,7 @@ class pkgFLCache const char *To); bool AddConfFile(const char *Name,const char *NameEnd, PkgIterator const &Owner,const unsigned char *Sum); - + pkgFLCache(DynamicMMap &Map); // ~pkgFLCache(); }; @@ -109,7 +109,7 @@ struct pkgFLCache::Header short MajorVersion; short MinorVersion; bool Dirty; - + // Size of structure values unsigned HeaderSz; unsigned NodeSz; @@ -117,7 +117,7 @@ struct pkgFLCache::Header unsigned PackageSz; unsigned DiversionSz; unsigned ConfFileSz; - + // Structure Counts; unsigned int NodeCount; unsigned int DirCount; @@ -126,13 +126,13 @@ struct pkgFLCache::Header unsigned int ConfFileCount; unsigned int HashSize; unsigned long UniqNodes; - + // Offsets map_ptrloc FileHash; map_ptrloc DirTree; map_ptrloc Packages; map_ptrloc Diversions; - + /* Allocation pools, there should be one of these for each structure excluding the header */ DynamicMMap::Pool Pools[5]; @@ -177,7 +177,7 @@ struct pkgFLCache::Diversion map_ptrloc OwnerPkg; // Package map_ptrloc DivertFrom; // Node map_ptrloc DivertTo; // String - + map_ptrloc Next; // Diversion unsigned long Flags; @@ -194,120 +194,120 @@ class pkgFLCache::PkgIterator { Package *Pkg; pkgFLCache *Owner; - + public: - + inline bool end() const {return Owner == 0 || Pkg == Owner->PkgP?true:false;} - + // Accessors - inline Package *operator ->() {return Pkg;}; - inline Package const *operator ->() const {return Pkg;}; - inline Package const &operator *() const {return *Pkg;}; - inline operator Package *() {return Pkg == Owner->PkgP?0:Pkg;}; - inline operator Package const *() const {return Pkg == Owner->PkgP?0:Pkg;}; - - inline unsigned long Offset() const {return Pkg - Owner->PkgP;}; - inline const char *Name() const {return Pkg->Name == 0?0:Owner->StrP + Pkg->Name;}; + inline Package *operator ->() {return Pkg;} + inline Package const *operator ->() const {return Pkg;} + inline Package const &operator *() const {return *Pkg;} + inline operator Package *() {return Pkg == Owner->PkgP?0:Pkg;} + inline operator Package const *() const {return Pkg == Owner->PkgP?0:Pkg;} + + inline unsigned long Offset() const {return Pkg - Owner->PkgP;} + inline const char *Name() const {return Pkg->Name == 0?0:Owner->StrP + Pkg->Name;} inline pkgFLCache::NodeIterator Files() const; - PkgIterator() : Pkg(0), Owner(0) {}; - PkgIterator(pkgFLCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner) {}; + PkgIterator() : Pkg(0), Owner(0) {} + PkgIterator(pkgFLCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner) {} }; class pkgFLCache::DirIterator { Directory *Dir; pkgFLCache *Owner; - + public: - + // Accessors - inline Directory *operator ->() {return Dir;}; - inline Directory const *operator ->() const {return Dir;}; - inline Directory const &operator *() const {return *Dir;}; - inline operator Directory *() {return Dir == Owner->DirP?0:Dir;}; - inline operator Directory const *() const {return Dir == Owner->DirP?0:Dir;}; + inline Directory *operator ->() {return Dir;} + inline Directory const *operator ->() const {return Dir;} + inline Directory const &operator *() const {return *Dir;} + inline operator Directory *() {return Dir == Owner->DirP?0:Dir;} + inline operator Directory const *() const {return Dir == Owner->DirP?0:Dir;} - inline const char *Name() const {return Dir->Name == 0?0:Owner->StrP + Dir->Name;}; + inline const char *Name() const {return Dir->Name == 0?0:Owner->StrP + Dir->Name;} - DirIterator() : Dir(0), Owner(0) {}; - DirIterator(pkgFLCache &Owner,Directory *Trg) : Dir(Trg), Owner(&Owner) {}; + DirIterator() : Dir(0), Owner(0) {} + DirIterator(pkgFLCache &Owner,Directory *Trg) : Dir(Trg), Owner(&Owner) {} }; class pkgFLCache::DiverIterator { Diversion *Diver; pkgFLCache *Owner; - + public: // Iteration - void operator ++(int) {if (Diver != Owner->DiverP) Diver = Owner->DiverP + Diver->Next;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Diver == Owner->DiverP;}; + void operator ++(int) {if (Diver != Owner->DiverP) Diver = Owner->DiverP + Diver->Next;} + inline void operator ++() {operator ++(0);} + inline bool end() const {return Owner == 0 || Diver == Owner->DiverP;} // Accessors - inline Diversion *operator ->() {return Diver;}; - inline Diversion const *operator ->() const {return Diver;}; - inline Diversion const &operator *() const {return *Diver;}; - inline operator Diversion *() {return Diver == Owner->DiverP?0:Diver;}; - inline operator Diversion const *() const {return Diver == Owner->DiverP?0:Diver;}; + inline Diversion *operator ->() {return Diver;} + inline Diversion const *operator ->() const {return Diver;} + inline Diversion const &operator *() const {return *Diver;} + inline operator Diversion *() {return Diver == Owner->DiverP?0:Diver;} + inline operator Diversion const *() const {return Diver == Owner->DiverP?0:Diver;} - inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Diver->OwnerPkg);}; + inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Diver->OwnerPkg);} inline NodeIterator DivertFrom() const; inline NodeIterator DivertTo() const; DiverIterator() : Diver(0), Owner(0) {}; - DiverIterator(pkgFLCache &Owner,Diversion *Trg) : Diver(Trg), Owner(&Owner) {}; + DiverIterator(pkgFLCache &Owner,Diversion *Trg) : Diver(Trg), Owner(&Owner) {} }; class pkgFLCache::NodeIterator { Node *Nde; - enum {NdePkg, NdeHash} Type; + enum {NdePkg, NdeHash} Type; pkgFLCache *Owner; - + public: - + // Iteration - void operator ++(int) {if (Nde != Owner->NodeP) Nde = Owner->NodeP + - (Type == NdePkg?Nde->NextPkg:Nde->Next);}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Nde == Owner->NodeP;}; + void operator ++(int) {if (Nde != Owner->NodeP) Nde = Owner->NodeP + + (Type == NdePkg?Nde->NextPkg:Nde->Next);} + inline void operator ++() {operator ++(0);} + inline bool end() const {return Owner == 0 || Nde == Owner->NodeP;} // Accessors - inline Node *operator ->() {return Nde;}; - inline Node const *operator ->() const {return Nde;}; - inline Node const &operator *() const {return *Nde;}; - inline operator Node *() {return Nde == Owner->NodeP?0:Nde;}; - inline operator Node const *() const {return Nde == Owner->NodeP?0:Nde;}; - inline unsigned long Offset() const {return Nde - Owner->NodeP;}; - inline DirIterator Dir() const {return DirIterator(*Owner,Owner->DirP + Nde->Dir);}; - inline DiverIterator Diversion() const {return DiverIterator(*Owner,Owner->DiverP + Nde->Pointer);}; - inline const char *File() const {return Nde->File == 0?0:Owner->StrP + Nde->File;}; - inline const char *DirN() const {return Owner->StrP + Owner->DirP[Nde->Dir].Name;}; + inline Node *operator ->() {return Nde;} + inline Node const *operator ->() const {return Nde;} + inline Node const &operator *() const {return *Nde;} + inline operator Node *() {return Nde == Owner->NodeP?0:Nde;} + inline operator Node const *() const {return Nde == Owner->NodeP?0:Nde;} + inline unsigned long Offset() const {return Nde - Owner->NodeP;} + inline DirIterator Dir() const {return DirIterator(*Owner,Owner->DirP + Nde->Dir);} + inline DiverIterator Diversion() const {return DiverIterator(*Owner,Owner->DiverP + Nde->Pointer);} + inline const char *File() const {return Nde->File == 0?0:Owner->StrP + Nde->File;} + inline const char *DirN() const {return Owner->StrP + Owner->DirP[Nde->Dir].Name;} Package *RealPackage() const; - + NodeIterator() : Nde(0), Type(NdeHash), Owner(0) {}; - NodeIterator(pkgFLCache &Owner) : Nde(Owner.NodeP), Type(NdeHash), Owner(&Owner) {}; - NodeIterator(pkgFLCache &Owner,Node *Trg) : Nde(Trg), Type(NdeHash), Owner(&Owner) {}; - NodeIterator(pkgFLCache &Owner,Node *Trg,Package *) : Nde(Trg), Type(NdePkg), Owner(&Owner) {}; + NodeIterator(pkgFLCache &Owner) : Nde(Owner.NodeP), Type(NdeHash), Owner(&Owner) {} + NodeIterator(pkgFLCache &Owner,Node *Trg) : Nde(Trg), Type(NdeHash), Owner(&Owner) {} + NodeIterator(pkgFLCache &Owner,Node *Trg,Package *) : Nde(Trg), Type(NdePkg), Owner(&Owner) {} }; /* Inlines with forward references that cannot be included directly in their respsective classes */ -inline pkgFLCache::NodeIterator pkgFLCache::DiverIterator::DivertFrom() const - {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertFrom);}; +inline pkgFLCache::NodeIterator pkgFLCache::DiverIterator::DivertFrom() const + {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertFrom);} inline pkgFLCache::NodeIterator pkgFLCache::DiverIterator::DivertTo() const - {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertTo);}; + {return NodeIterator(*Owner,Owner->NodeP + Diver->DivertTo);} inline pkgFLCache::NodeIterator pkgFLCache::PkgIterator::Files() const - {return NodeIterator(*Owner,Owner->NodeP + Pkg->Files,Pkg);}; + {return NodeIterator(*Owner,Owner->NodeP + Pkg->Files,Pkg);} inline pkgFLCache::DiverIterator pkgFLCache::DiverBegin() - {return DiverIterator(*this,DiverP + HeaderP->Diversions);}; + {return DiverIterator(*this,DiverP + HeaderP->Diversions);} -inline pkgFLCache::PkgIterator pkgFLCache::GetPkg(const char *Name,bool Insert) - {return GetPkg(Name,Name+strlen(Name),Insert);}; +inline pkgFLCache::PkgIterator pkgFLCache::GetPkg(const char *Name,bool Insert) + {return GetPkg(Name,Name+strlen(Name),Insert);} #endif diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 120e809e1..e8fa68338 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -468,7 +468,7 @@ void pkgAcquire::Bump() pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I) { return I->NextAcquire; -}; +} /*}}}*/ // Acquire::Clean - Cleans a directory /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index ea6a4afba..ca8bc5ca0 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -55,26 +55,26 @@ template<typename Str, typename Itr> class pkgCache::Iterator : public: // Iteration virtual void operator ++(int) = 0; - virtual void operator ++() = 0; // Should be {operator ++(0);}; - inline bool end() const {return Owner == 0 || S == OwnerPointer();}; + virtual void operator ++() = 0; // Should be {operator ++(0);} + inline bool end() const {return Owner == 0 || S == OwnerPointer();} // Comparison - inline bool operator ==(const Itr &B) const {return S == B.S;}; - inline bool operator !=(const Itr &B) const {return S != B.S;}; + inline bool operator ==(const Itr &B) const {return S == B.S;} + inline bool operator !=(const Itr &B) const {return S != B.S;} // Accessors - inline Str *operator ->() {return S;}; - inline Str const *operator ->() const {return S;}; - inline operator Str *() {return S == OwnerPointer() ? 0 : S;}; - inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}; - inline Str &operator *() {return *S;}; - inline Str const &operator *() const {return *S;}; - inline pkgCache *Cache() const {return Owner;}; + inline Str *operator ->() {return S;} + inline Str const *operator ->() const {return S;} + inline operator Str *() {return S == OwnerPointer() ? 0 : S;} + inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;} + inline Str &operator *() {return *S;} + inline Str const &operator *() const {return *S;} + inline pkgCache *Cache() const {return Owner;} // Mixed stuff - inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;}; - inline bool IsGood() const { return S && Owner && ! end();}; - inline unsigned long Index() const {return S - OwnerPointer();}; + inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;} + inline bool IsGood() const { return S && Owner && ! end();} + inline unsigned long Index() const {return S - OwnerPointer();} void ReMap(void const * const oldMap, void const * const newMap) { if (Owner == 0 || S == 0) @@ -83,8 +83,8 @@ template<typename Str, typename Itr> class pkgCache::Iterator : } // Constructors - look out for the variable assigning - inline Iterator() : S(0), Owner(0) {}; - inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}; + inline Iterator() : S(0), Owner(0) {} + inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {} }; /*}}}*/ // Group Iterator /*{{{*/ @@ -98,19 +98,19 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> { protected: inline Group* OwnerPointer() const { return (Owner != 0) ? Owner->GrpP : 0; - }; + } public: // This constructor is the 'begin' constructor, never use it. inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) { S = OwnerPointer(); operator ++(0); - }; + } virtual void operator ++(int); - virtual void operator ++() {operator ++(0);}; + virtual void operator ++() {operator ++(0);} - inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; + inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;} inline PkgIterator PackageList() const; PkgIterator FindPkg(std::string Arch = "any") const; /** \brief find the package with the "best" architecture @@ -127,8 +127,8 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> { inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg), HashIndex(0) { if (S == 0) S = OwnerPointer(); - }; - inline GrpIterator() : Iterator<Group, GrpIterator>(), HashIndex(0) {}; + } + inline GrpIterator() : Iterator<Group, GrpIterator>(), HashIndex(0) {} }; /*}}}*/ @@ -139,27 +139,27 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> { protected: inline Package* OwnerPointer() const { return (Owner != 0) ? Owner->PkgP : 0; - }; + } public: // This constructor is the 'begin' constructor, never use it. inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) { S = OwnerPointer(); operator ++(0); - }; + } virtual void operator ++(int); - virtual void operator ++() {operator ++(0);}; + virtual void operator ++() {operator ++(0);} enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure}; // Accessors - inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; - inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; + inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;} + inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;} inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge || - (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}; - inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}; - inline GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);}; + (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);} + inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;} + inline GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);} inline VerIterator VersionList() const; inline VerIterator CurrentVer() const; @@ -177,8 +177,8 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> { inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator<Package, PkgIterator>(Owner, Trg), HashIndex(0) { if (S == 0) S = OwnerPointer(); - }; - inline PkgIterator() : Iterator<Package, PkgIterator>(), HashIndex(0) {}; + } + inline PkgIterator() : Iterator<Package, PkgIterator>(), HashIndex(0) {} }; /*}}}*/ // Version Iterator /*{{{*/ @@ -186,12 +186,12 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { protected: inline Version* OwnerPointer() const { return (Owner != 0) ? Owner->VerP : 0; - }; + } public: // Iteration - void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;}; - inline void operator ++() {operator ++(0);}; + void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;} + inline void operator ++() {operator ++(0);} // Comparison int CompareVer(const VerIterator &B) const; @@ -201,17 +201,17 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { referring to the same "real" version */ inline bool SimilarVer(const VerIterator &B) const { return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0); - }; + } // Accessors - inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; - inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; + inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;} + inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;} inline const char *Arch() const { if ((S->MultiArch & pkgCache::Version::All) == pkgCache::Version::All) return "all"; return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; - }; - inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; + } + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);} inline DescIterator DescriptionList() const; DescIterator TranslatedDescription() const; @@ -219,7 +219,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { inline PrvIterator ProvidesList() const; inline VerFileIterator FileList() const; bool Downloadable() const; - inline const char *PriorityType() const {return Owner->Priority(S->Priority);}; + inline const char *PriorityType() const {return Owner->Priority(S->Priority);} const char *MultiArchType() const; std::string RelStr() const; @@ -229,8 +229,8 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) { if (S == 0) S = OwnerPointer(); - }; - inline VerIterator() : Iterator<Version, VerIterator>() {}; + } + inline VerIterator() : Iterator<Version, VerIterator>() {} }; /*}}}*/ // Description Iterator /*{{{*/ @@ -238,26 +238,26 @@ class pkgCache::DescIterator : public Iterator<Description, DescIterator> { protected: inline Description* OwnerPointer() const { return (Owner != 0) ? Owner->DescP : 0; - }; + } public: // Iteration - void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;}; - inline void operator ++() {operator ++(0);}; + void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;} + inline void operator ++() {operator ++(0);} // Comparison int CompareDesc(const DescIterator &B) const; // Accessors - inline const char *LanguageCode() const {return Owner->StrP + S->language_code;}; - inline const char *md5() const {return Owner->StrP + S->md5sum;}; + inline const char *LanguageCode() const {return Owner->StrP + S->language_code;} + inline const char *md5() const {return Owner->StrP + S->md5sum;} inline DescFileIterator FileList() const; - inline DescIterator() : Iterator<Description, DescIterator>() {}; + inline DescIterator() : Iterator<Description, DescIterator>() {} inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Iterator<Description, DescIterator>(Owner, Trg) { if (S == 0) S = Owner.DescP; - }; + } }; /*}}}*/ // Dependency iterator /*{{{*/ @@ -267,21 +267,21 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> { protected: inline Dependency* OwnerPointer() const { return (Owner != 0) ? Owner->DepP : 0; - }; + } public: // Iteration void operator ++(int) {if (S != Owner->DepP) S = Owner->DepP + - (Type == DepVer ? S->NextDepends : S->NextRevDepends);}; - inline void operator ++() {operator ++(0);}; + (Type == DepVer ? S->NextDepends : S->NextRevDepends);} + inline void operator ++() {operator ++(0);} // Accessors - inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;}; - inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);}; - inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; - inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}; - inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; - inline bool Reverse() const {return Type == DepRev;}; + inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;} + inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);} + inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;} + inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);} + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);} + inline bool Reverse() const {return Type == DepRev;} bool IsCritical() const; bool IsNegative() const; bool IsIgnorable(PrvIterator const &Prv) const; @@ -292,8 +292,8 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> { void GlobOr(DepIterator &Start,DepIterator &End); Version **AllTargets() const; bool SmartTargetPkg(PkgIterator &Result) const; - inline const char *CompType() const {return Owner->CompType(S->CompareOp);}; - inline const char *DepType() const {return Owner->DepType(S->Type);}; + inline const char *CompType() const {return Owner->CompType(S->CompareOp);} + inline const char *DepType() const {return Owner->DepType(S->Type);} //Nice printable representation friend std::ostream& operator <<(std::ostream& out, DepIterator D); @@ -302,13 +302,13 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> { Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer) { if (S == 0) S = Owner.DepP; - }; + } inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) : Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepRev) { if (S == 0) S = Owner.DepP; - }; - inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer) {}; + } + inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer) {} }; /*}}}*/ // Provides iterator /*{{{*/ @@ -318,34 +318,34 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> { protected: inline Provides* OwnerPointer() const { return (Owner != 0) ? Owner->ProvideP : 0; - }; + } public: // Iteration void operator ++(int) {if (S != Owner->ProvideP) S = Owner->ProvideP + - (Type == PrvVer?S->NextPkgProv:S->NextProvides);}; - inline void operator ++() {operator ++(0);}; + (Type == PrvVer?S->NextPkgProv:S->NextProvides);} + inline void operator ++() {operator ++(0);} // Accessors - inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;}; - inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;}; - inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; - inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);}; - inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}; + inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;} + inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;} + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);} + inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);} + inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);} bool IsMultiArchImplicit() const; - inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {}; + inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {} inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) : Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvVer) { if (S == 0) S = Owner.ProvideP; - }; + } inline PrvIterator(pkgCache &Owner, Provides *Trg, Package*) : Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvPkg) { if (S == 0) S = Owner.ProvideP; - }; + } }; /*}}}*/ // Package file /*{{{*/ @@ -353,32 +353,32 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> protected: inline PackageFile* OwnerPointer() const { return (Owner != 0) ? Owner->PkgFileP : 0; - }; + } public: // Iteration - void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;}; - inline void operator ++() {operator ++(0);}; + void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;} + inline void operator ++() {operator ++(0);} // Accessors - inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}; - inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}; - inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}; - inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}; - inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}; - inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}; - inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}; - inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}; - inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}; - inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}; + inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;} + inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;} + inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;} + inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;} + inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;} + inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;} + inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;} + inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;} + inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;} + inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;} bool IsOk(); std::string RelStr(); // Constructors - inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}; - inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}; - inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}; + inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {} + inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {} + inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {} }; /*}}}*/ // Version File /*{{{*/ @@ -386,18 +386,18 @@ class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIter protected: inline VerFile* OwnerPointer() const { return (Owner != 0) ? Owner->VerFileP : 0; - }; + } public: // Iteration - void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;}; - inline void operator ++() {operator ++(0);}; + void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;} + inline void operator ++() {operator ++(0);} // Accessors - inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}; + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);} - inline VerFileIterator() : Iterator<VerFile, VerFileIterator>() {}; - inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator<VerFile, VerFileIterator>(Owner, Trg) {}; + inline VerFileIterator() : Iterator<VerFile, VerFileIterator>() {} + inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator<VerFile, VerFileIterator>(Owner, Trg) {} }; /*}}}*/ // Description File /*{{{*/ @@ -405,40 +405,40 @@ class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> { protected: inline DescFile* OwnerPointer() const { return (Owner != 0) ? Owner->DescFileP : 0; - }; + } public: // Iteration - void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;}; - inline void operator ++() {operator ++(0);}; + void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;} + inline void operator ++() {operator ++(0);} // Accessors - inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}; + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);} - inline DescFileIterator() : Iterator<DescFile, DescFileIterator>() {}; - inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {}; + inline DescFileIterator() : Iterator<DescFile, DescFileIterator>() {} + inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {} }; /*}}}*/ // Inlined Begin functions can't be in the class because of order problems /*{{{*/ inline pkgCache::PkgIterator pkgCache::GrpIterator::PackageList() const - {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);}; + {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);} inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const - {return VerIterator(*Owner,Owner->VerP + S->VersionList);}; + {return VerIterator(*Owner,Owner->VerP + S->VersionList);} inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const - {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);}; + {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);} inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const - {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);}; + {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);} inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const - {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}; + {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);} inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const - {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);}; + {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);} inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const - {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}; + {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);} inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const - {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);}; + {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);} inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const - {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);}; + {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);} inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const - {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);}; + {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);} /*}}}*/ #endif diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index ce502d8ca..ef28bbc34 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -43,8 +43,8 @@ class CacheSetHelper { /*{{{*/ public: /*{{{*/ CacheSetHelper(bool const ShowError = true, GlobalError::MsgType ErrorType = GlobalError::ERROR) : - ShowError(ShowError), ErrorType(ErrorType) {}; - virtual ~CacheSetHelper() {}; + ShowError(ShowError), ErrorType(ErrorType) {} + virtual ~CacheSetHelper() {} virtual void showTaskSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); virtual void showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); @@ -76,9 +76,9 @@ public: /*{{{*/ virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); - bool showErrors() const { return ShowError; }; - bool showErrors(bool const newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; - GlobalError::MsgType errorType() const { return ErrorType; }; + bool showErrors() const { return ShowError; } + bool showErrors(bool const newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); } + GlobalError::MsgType errorType() const { return ErrorType; } GlobalError::MsgType errorType(GlobalError::MsgType const &newValue) { if (ErrorType == newValue) return ErrorType; @@ -87,7 +87,7 @@ public: /*{{{*/ ErrorType = newValue; return oldValue; } - }; + } /*}}}*/ protected: @@ -124,12 +124,12 @@ public: inline pkgCache::PkgIterator::OkState State() const { return getPkg().State(); } inline const char *CandVersion() const { return getPkg().CandVersion(); } inline const char *CurVersion() const { return getPkg().CurVersion(); } - inline pkgCache *Cache() const { return getPkg().Cache(); }; - inline unsigned long Index() const {return getPkg().Index();}; + inline pkgCache *Cache() const { return getPkg().Cache(); } + inline unsigned long Index() const {return getPkg().Index();} // we have only valid iterators here - inline bool end() const { return false; }; + inline bool end() const { return false; } - inline pkgCache::Package const * operator->() const {return &*getPkg();}; + inline pkgCache::Package const * operator->() const {return &*getPkg();} }; /*}}}*/ @@ -154,7 +154,7 @@ public: unsigned short ID; const char * const Alias; Position Pos; - Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {} }; static bool FromModifierCommandLine(unsigned short &modID, PackageContainerInterface * const pci, @@ -177,12 +177,12 @@ public: /*{{{*/ public: const_iterator(typename Container::const_iterator i) : _iter(i) {} pkgCache::PkgIterator getPkg(void) const { return *_iter; } - inline pkgCache::PkgIterator operator*(void) const { return *_iter; }; + inline pkgCache::PkgIterator operator*(void) const { return *_iter; } operator typename Container::const_iterator(void) const { return _iter; } inline const_iterator& operator++() { ++_iter; return *this; } inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; } - inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }; - inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; + inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; } + inline bool operator==(const_iterator const &i) const { return _iter == i._iter; } friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } }; class iterator : public PackageContainerInterface::const_iterator, @@ -191,43 +191,43 @@ public: /*{{{*/ public: iterator(typename Container::iterator i) : _iter(i) {} pkgCache::PkgIterator getPkg(void) const { return *_iter; } - inline pkgCache::PkgIterator operator*(void) const { return *_iter; }; + inline pkgCache::PkgIterator operator*(void) const { return *_iter; } operator typename Container::iterator(void) const { return _iter; } operator typename PackageContainer<Container>::const_iterator() { return typename PackageContainer<Container>::const_iterator(_iter); } inline iterator& operator++() { ++_iter; return *this; } inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; } - inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; - inline bool operator==(iterator const &i) const { return _iter == i._iter; }; - inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; }; - inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; }; + inline bool operator!=(iterator const &i) const { return _iter != i._iter; } + inline bool operator==(iterator const &i) const { return _iter == i._iter; } + inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; } + inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; } friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); } }; /*}}}*/ - bool insert(pkgCache::PkgIterator const &P) { if (P.end() == true) return false; _cont.insert(P); return true; }; - template<class Cont> void insert(PackageContainer<Cont> const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); }; - void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }; + bool insert(pkgCache::PkgIterator const &P) { if (P.end() == true) return false; _cont.insert(P); return true; } + template<class Cont> void insert(PackageContainer<Cont> const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); } + void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); } - bool empty() const { return _cont.empty(); }; - void clear() { return _cont.clear(); }; + bool empty() const { return _cont.empty(); } + void clear() { return _cont.clear(); } //FIXME: on ABI break, replace the first with the second without bool - void erase(iterator position) { _cont.erase((typename Container::iterator)position); }; - iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); }; - size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); }; - void erase(iterator first, iterator last) { _cont.erase(first, last); }; - size_t size() const { return _cont.size(); }; + void erase(iterator position) { _cont.erase((typename Container::iterator)position); } + iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); } + size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); } + void erase(iterator first, iterator last) { _cont.erase(first, last); } + size_t size() const { return _cont.size(); } - const_iterator begin() const { return const_iterator(_cont.begin()); }; - const_iterator end() const { return const_iterator(_cont.end()); }; - iterator begin() { return iterator(_cont.begin()); }; - iterator end() { return iterator(_cont.end()); }; - const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }; + const_iterator begin() const { return const_iterator(_cont.begin()); } + const_iterator end() const { return const_iterator(_cont.end()); } + iterator begin() { return iterator(_cont.begin()); } + iterator end() { return iterator(_cont.end()); } + const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); } - void setConstructor(Constructor const &by) { ConstructedBy = by; }; - Constructor getConstructor() const { return ConstructedBy; }; + void setConstructor(Constructor const &by) { ConstructedBy = by; } + Constructor getConstructor() const { return ConstructedBy; } - PackageContainer() : ConstructedBy(UNKNOWN) {}; - PackageContainer(Constructor const &by) : ConstructedBy(by) {}; + PackageContainer() : ConstructedBy(UNKNOWN) {} + PackageContainer(Constructor const &by) : ConstructedBy(by) {} /** \brief returns all packages in the cache who belong to the given task @@ -365,7 +365,7 @@ private: /*{{{*/ template<> template<class Cont> void PackageContainer<std::list<pkgCache::PkgIterator> >::insert(PackageContainer<Cont> const &pkgcont) { for (typename PackageContainer<Cont>::const_iterator p = pkgcont.begin(); p != pkgcont.end(); ++p) _cont.push_back(*p); -}; +} // these two are 'inline' as otherwise the linker has problems with seeing these untemplated // specializations again and again - but we need to see them, so that library users can use them template<> inline bool PackageContainer<std::list<pkgCache::PkgIterator> >::insert(pkgCache::PkgIterator const &P) { @@ -373,11 +373,11 @@ template<> inline bool PackageContainer<std::list<pkgCache::PkgIterator> >::inse return false; _cont.push_back(P); return true; -}; +} template<> inline void PackageContainer<std::list<pkgCache::PkgIterator> >::insert(const_iterator begin, const_iterator end) { for (const_iterator p = begin; p != end; ++p) _cont.push_back(*p); -}; +} typedef PackageContainer<std::set<pkgCache::PkgIterator> > PackageSet; typedef PackageContainer<std::list<pkgCache::PkgIterator> > PackageList; @@ -392,27 +392,27 @@ public: virtual pkgCache::VerIterator getVer() const = 0; operator pkgCache::VerIterator(void) { return getVer(); } - inline pkgCache *Cache() const { return getVer().Cache(); }; - inline unsigned long Index() const {return getVer().Index();}; - inline int CompareVer(const pkgCache::VerIterator &B) const { return getVer().CompareVer(B); }; - inline const char *VerStr() const { return getVer().VerStr(); }; - inline const char *Section() const { return getVer().Section(); }; - inline const char *Arch() const { return getVer().Arch(); }; - inline pkgCache::PkgIterator ParentPkg() const { return getVer().ParentPkg(); }; - inline pkgCache::DescIterator DescriptionList() const { return getVer().DescriptionList(); }; - inline pkgCache::DescIterator TranslatedDescription() const { return getVer().TranslatedDescription(); }; - inline pkgCache::DepIterator DependsList() const { return getVer().DependsList(); }; - inline pkgCache::PrvIterator ProvidesList() const { return getVer().ProvidesList(); }; - inline pkgCache::VerFileIterator FileList() const { return getVer().FileList(); }; - inline bool Downloadable() const { return getVer().Downloadable(); }; - inline const char *PriorityType() const { return getVer().PriorityType(); }; - inline std::string RelStr() const { return getVer().RelStr(); }; - inline bool Automatic() const { return getVer().Automatic(); }; - inline pkgCache::VerFileIterator NewestFile() const { return getVer().NewestFile(); }; + inline pkgCache *Cache() const { return getVer().Cache(); } + inline unsigned long Index() const {return getVer().Index();} + inline int CompareVer(const pkgCache::VerIterator &B) const { return getVer().CompareVer(B); } + inline const char *VerStr() const { return getVer().VerStr(); } + inline const char *Section() const { return getVer().Section(); } + inline const char *Arch() const { return getVer().Arch(); } + inline pkgCache::PkgIterator ParentPkg() const { return getVer().ParentPkg(); } + inline pkgCache::DescIterator DescriptionList() const { return getVer().DescriptionList(); } + inline pkgCache::DescIterator TranslatedDescription() const { return getVer().TranslatedDescription(); } + inline pkgCache::DepIterator DependsList() const { return getVer().DependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return getVer().ProvidesList(); } + inline pkgCache::VerFileIterator FileList() const { return getVer().FileList(); } + inline bool Downloadable() const { return getVer().Downloadable(); } + inline const char *PriorityType() const { return getVer().PriorityType(); } + inline std::string RelStr() const { return getVer().RelStr(); } + inline bool Automatic() const { return getVer().Automatic(); } + inline pkgCache::VerFileIterator NewestFile() const { return getVer().NewestFile(); } // we have only valid iterators here - inline bool end() const { return false; }; + inline bool end() const { return false; } - inline pkgCache::Version const * operator->() const { return &*getVer(); }; + inline pkgCache::Version const * operator->() const { return &*getVer(); } }; /*}}}*/ @@ -446,7 +446,7 @@ public: Version SelectVersion; Modifier (unsigned short const &id, const char * const alias, Position const &pos, Version const &select) : ID(id), Alias(alias), Pos(pos), - SelectVersion(select) {}; + SelectVersion(select) {} }; static bool FromCommandLine(VersionContainerInterface * const vci, pkgCacheFile &Cache, @@ -509,12 +509,12 @@ public: /*{{{*/ public: const_iterator(typename Container::const_iterator i) : _iter(i) {} pkgCache::VerIterator getVer(void) const { return *_iter; } - inline pkgCache::VerIterator operator*(void) const { return *_iter; }; + inline pkgCache::VerIterator operator*(void) const { return *_iter; } operator typename Container::const_iterator(void) const { return _iter; } inline const_iterator& operator++() { ++_iter; return *this; } inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; } - inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }; - inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; + inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; } + inline bool operator==(const_iterator const &i) const { return _iter == i._iter; } friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } }; class iterator : public VersionContainerInterface::const_iterator, @@ -523,36 +523,36 @@ public: /*{{{*/ public: iterator(typename Container::iterator i) : _iter(i) {} pkgCache::VerIterator getVer(void) const { return *_iter; } - inline pkgCache::VerIterator operator*(void) const { return *_iter; }; + inline pkgCache::VerIterator operator*(void) const { return *_iter; } operator typename Container::iterator(void) const { return _iter; } operator typename VersionContainer<Container>::const_iterator() { return typename VersionContainer<Container>::const_iterator(_iter); } inline iterator& operator++() { ++_iter; return *this; } inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; } - inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; - inline bool operator==(iterator const &i) const { return _iter == i._iter; }; - inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; }; - inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; }; + inline bool operator!=(iterator const &i) const { return _iter != i._iter; } + inline bool operator==(iterator const &i) const { return _iter == i._iter; } + inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; } + inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; } friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); } }; /*}}}*/ - bool insert(pkgCache::VerIterator const &V) { if (V.end() == true) return false; _cont.insert(V); return true; }; - template<class Cont> void insert(VersionContainer<Cont> const &vercont) { _cont.insert((typename Cont::const_iterator)vercont.begin(), (typename Cont::const_iterator)vercont.end()); }; - void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }; - bool empty() const { return _cont.empty(); }; - void clear() { return _cont.clear(); }; + bool insert(pkgCache::VerIterator const &V) { if (V.end() == true) return false; _cont.insert(V); return true; } + template<class Cont> void insert(VersionContainer<Cont> const &vercont) { _cont.insert((typename Cont::const_iterator)vercont.begin(), (typename Cont::const_iterator)vercont.end()); } + void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); } + bool empty() const { return _cont.empty(); } + void clear() { return _cont.clear(); } //FIXME: on ABI break, replace the first with the second without bool - void erase(iterator position) { _cont.erase((typename Container::iterator)position); }; - iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); }; - size_t erase(const pkgCache::VerIterator x) { return _cont.erase(x); }; - void erase(iterator first, iterator last) { _cont.erase(first, last); }; - size_t size() const { return _cont.size(); }; - - const_iterator begin() const { return const_iterator(_cont.begin()); }; - const_iterator end() const { return const_iterator(_cont.end()); }; - iterator begin() { return iterator(_cont.begin()); }; - iterator end() { return iterator(_cont.end()); }; - const_iterator find(pkgCache::VerIterator const &V) const { return const_iterator(_cont.find(V)); }; + void erase(iterator position) { _cont.erase((typename Container::iterator)position); } + iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); } + size_t erase(const pkgCache::VerIterator x) { return _cont.erase(x); } + void erase(iterator first, iterator last) { _cont.erase(first, last); } + size_t size() const { return _cont.size(); } + + const_iterator begin() const { return const_iterator(_cont.begin()); } + const_iterator end() const { return const_iterator(_cont.end()); } + iterator begin() { return iterator(_cont.begin()); } + iterator end() { return iterator(_cont.end()); } + const_iterator find(pkgCache::VerIterator const &V) const { return const_iterator(_cont.find(V)); } /** \brief returns all versions specified on the commandline @@ -659,7 +659,7 @@ public: /*{{{*/ template<> template<class Cont> void VersionContainer<std::list<pkgCache::VerIterator> >::insert(VersionContainer<Cont> const &vercont) { for (typename VersionContainer<Cont>::const_iterator v = vercont.begin(); v != vercont.end(); ++v) _cont.push_back(*v); -}; +} // these two are 'inline' as otherwise the linker has problems with seeing these untemplated // specializations again and again - but we need to see them, so that library users can use them template<> inline bool VersionContainer<std::list<pkgCache::VerIterator> >::insert(pkgCache::VerIterator const &V) { @@ -667,11 +667,11 @@ template<> inline bool VersionContainer<std::list<pkgCache::VerIterator> >::inse return false; _cont.push_back(V); return true; -}; +} template<> inline void VersionContainer<std::list<pkgCache::VerIterator> >::insert(const_iterator begin, const_iterator end) { for (const_iterator v = begin; v != end; ++v) _cont.push_back(*v); -}; +} typedef VersionContainer<std::set<pkgCache::VerIterator> > VersionSet; typedef VersionContainer<std::list<pkgCache::VerIterator> > VersionList; } diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 3ae1e8b1d..838c8887a 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -933,10 +933,10 @@ pkgUdevCdromDevices::Dlopen() /*{{{*/ // convenience interface, this will just call ScanForRemovable vector<CdromDevice> pkgUdevCdromDevices::Scan() -{ +{ bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true); - return ScanForRemovable(CdromOnly); -}; + return ScanForRemovable(CdromOnly); +} /*}}}*/ /*{{{*/ vector<CdromDevice> diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 8eddd56d4..003fd01d8 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -43,8 +43,7 @@ Configuration::Configuration() : ToFree(true) } Configuration::Configuration(const Item *Root) : Root((Item *)Root), ToFree(false) { -}; - +} /*}}}*/ // Configuration::~Configuration - Destructor /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index d457781c3..2d25f5ed9 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -223,7 +223,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold, void GlobalError::Discard() { Messages.clear(); PendingFlag = false; -}; +} /*}}}*/ // GlobalError::empty - does our error list include anything? /*{{{*/ bool GlobalError::empty(MsgType const &trashhold) const { diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 1d79a52ac..d9712d6a8 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -45,7 +45,7 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig, int const &statusfd = -1) { int fd[2]; ExecGPGV(File, FileSig, statusfd, fd); -}; +} #undef APT_noreturn diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 916e1d730..9d74ed495 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -125,14 +125,14 @@ bool OpProgress::CheckChange(float Interval) // OpTextProgress::OpTextProgress - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -OpTextProgress::OpTextProgress(Configuration &Config) : - NoUpdate(false), NoDisplay(false), LastLen(0) +OpTextProgress::OpTextProgress(Configuration &Config) : + NoUpdate(false), NoDisplay(false), LastLen(0) { if (Config.FindI("quiet",0) >= 1 || Config.FindB("quiet::NoUpdate", false) == true) NoUpdate = true; if (Config.FindI("quiet",0) >= 2) NoDisplay = true; -}; +} /*}}}*/ // OpTextProgress::Done - Clean up the display /*{{{*/ // --------------------------------------------------------------------- @@ -150,12 +150,12 @@ void OpTextProgress::Done() cout << endl; OldOp = string(); } - + if (NoUpdate == true && NoDisplay == false && OldOp.empty() == false) { OldOp = string(); - cout << endl; - } + cout << endl; + } } /*}}}*/ // OpTextProgress::Update - Simple text spinner /*{{{*/ diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index f8bb3890d..0d85b4fd3 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -153,7 +153,7 @@ char *_strrstrip(char *String) End++; *End = 0; return String; -}; +} /*}}}*/ // strtabexpand - Converts tabs into 8 spaces /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 8d746f10e..3a6d38b75 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -37,8 +37,8 @@ namespace APT { namespace String { std::string Strip(const std::string &s); bool Endswith(const std::string &s, const std::string &ending); - }; -}; + } +} bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest); @@ -104,17 +104,17 @@ int tolower_ascii(int const c) __attrib_const __hot; std::string StripEpoch(const std::string &VerStr); #define APT_MKSTRCMP(name,func) \ -inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \ -inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ -inline int name(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \ -inline int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \ -inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);}; +inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));} \ +inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \ +inline int name(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));} \ +inline int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());} \ +inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);} #define APT_MKSTRCMP2(name,func) \ -inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ -inline int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \ -inline int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \ -inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);}; +inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \ +inline int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));} \ +inline int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());} \ +inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);} int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd); int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd); @@ -132,18 +132,18 @@ int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, std::string::const_iterator B,std::string::const_iterator BEnd); -inline int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));}; -inline int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));}; +inline int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));} +inline int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));} #endif -APT_MKSTRCMP2(stringcmp,stringcmp); -APT_MKSTRCMP2(stringcasecmp,stringcasecmp); +APT_MKSTRCMP2(stringcmp,stringcmp) +APT_MKSTRCMP2(stringcasecmp,stringcasecmp) // Return the length of a NULL-terminated string array size_t strv_length(const char **str_array); -inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);}; +inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);} class URI { @@ -159,13 +159,13 @@ class URI unsigned int Port; operator std::string(); - inline void operator =(const std::string &From) {CopyFrom(From);}; + inline void operator =(const std::string &From) {CopyFrom(From);} inline bool empty() {return Access.empty();}; static std::string SiteOnly(const std::string &URI); static std::string NoUserPassword(const std::string &URI); - URI(std::string Path) {CopyFrom(Path);}; - URI() : Port(0) {}; + URI(std::string Path) {CopyFrom(Path);} + URI() : Port(0) {} }; struct SubstVar diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index a12e6963d..90d0c9314 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1686,9 +1686,9 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) /*}}}*/ // Policy::GetPriority - Get the priority of the package pin /*{{{*/ signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &Pkg) -{ return 0; }; +{ return 0; } signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &File) -{ return 0; }; +{ return 0; } /*}}}*/ pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() /*{{{*/ { diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 9ea244139..89c9d531f 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -646,12 +646,12 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd, int fd[2]) { ExecGPGV(File, FileOut, statusfd, fd); return false; -}; +} bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd) { ExecGPGV(File, FileOut, statusfd); return false; -}; +} /*}}}*/ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ vector<string> &List, pkgCdromStatus *log) diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index a3a4cc0e1..aec744360 100644 --- a/apt-pkg/install-progress.cc +++ b/apt-pkg/install-progress.cc @@ -371,5 +371,5 @@ bool PackageManagerText::StatusChanged(std::string PackageName, -}; // namespace progress -}; // namespace apt +} // namespace progress +} // namespace apt diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h index 8a5b68a8f..8bcc32927 100644 --- a/apt-pkg/install-progress.h +++ b/apt-pkg/install-progress.h @@ -24,7 +24,7 @@ namespace Progress { int last_reported_progress; public: - PackageManager() + PackageManager() : percentage(0.0), last_reported_progress(-1) {}; virtual ~PackageManager() {}; @@ -32,8 +32,8 @@ namespace Progress { virtual void Start(int child_pty=-1) {}; virtual void Stop() {}; - /* When dpkg is invoked (may happen multiple times for each - * install/remove block + /* When dpkg is invoked (may happen multiple times for each + * install/remove block */ virtual void StartDpkg() {}; @@ -44,18 +44,18 @@ namespace Progress { return 500000; }; - virtual bool StatusChanged(std::string PackageName, + virtual bool StatusChanged(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, - std::string HumanReadableAction) ; - virtual void Error(std::string PackageName, + std::string HumanReadableAction); + virtual void Error(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, - std::string ErrorMessage) {}; + std::string ErrorMessage) {} virtual void ConffilePrompt(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, - std::string ConfMessage) {}; + std::string ConfMessage) {} }; class PackageManagerProgressFd : public PackageManager @@ -72,11 +72,11 @@ namespace Progress { virtual void StartDpkg(); virtual void Stop(); - virtual bool StatusChanged(std::string PackageName, + virtual bool StatusChanged(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, std::string HumanReadableAction); - virtual void Error(std::string PackageName, + virtual void Error(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, std::string ErrorMessage); @@ -101,11 +101,11 @@ namespace Progress { virtual void StartDpkg(); virtual void Stop(); - virtual bool StatusChanged(std::string PackageName, + virtual bool StatusChanged(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, std::string HumanReadableAction); - virtual void Error(std::string PackageName, + virtual void Error(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, std::string ErrorMessage); @@ -134,7 +134,7 @@ namespace Progress { ~PackageManagerFancy(); virtual void Start(int child_pty=-1); virtual void Stop(); - virtual bool StatusChanged(std::string PackageName, + virtual bool StatusChanged(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, std::string HumanReadableAction); @@ -143,14 +143,14 @@ namespace Progress { class PackageManagerText : public PackageManager { public: - virtual bool StatusChanged(std::string PackageName, + virtual bool StatusChanged(std::string PackageName, unsigned int StepsDone, unsigned int TotalSteps, std::string HumanReadableAction); }; -}; // namespace Progress -}; // namespace APT +} // namespace Progress +} // namespace APT #endif diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 67a2a709d..7d57640c5 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -414,7 +414,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const // GrpIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical group in the hash table. */ -void pkgCache::GrpIterator::operator ++(int) +void pkgCache::GrpIterator::operator ++(int) { // Follow the current links if (S != Owner->GrpP) @@ -426,12 +426,12 @@ void pkgCache::GrpIterator::operator ++(int) HashIndex++; S = Owner->GrpP + Owner->HeaderP->GrpHashTable[HashIndex]; } -}; +} /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical package in the hash table. */ -void pkgCache::PkgIterator::operator ++(int) +void pkgCache::PkgIterator::operator ++(int) { // Follow the current links if (S != Owner->PkgP) @@ -443,7 +443,7 @@ void pkgCache::PkgIterator::operator ++(int) HashIndex++; S = Owner->PkgP + Owner->HeaderP->PkgHashTable[HashIndex]; } -}; +} /*}}}*/ // PkgIterator::State - Check the State of the package /*{{{*/ // --------------------------------------------------------------------- @@ -475,26 +475,26 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const // --------------------------------------------------------------------- /* Return string representing of the candidate version. */ const char * -pkgCache::PkgIterator::CandVersion() const +pkgCache::PkgIterator::CandVersion() const { //TargetVer is empty, so don't use it. VerIterator version = pkgPolicy(Owner).GetCandidateVer(*this); if (version.IsGood()) return version.VerStr(); return 0; -}; +} /*}}}*/ // PkgIterator::CurVersion - Returns the current version string /*{{{*/ // --------------------------------------------------------------------- /* Return string representing of the current version. */ const char * -pkgCache::PkgIterator::CurVersion() const +pkgCache::PkgIterator::CurVersion() const { VerIterator version = CurrentVer(); if (version.IsGood()) return CurrentVer().VerStr(); return 0; -}; +} /*}}}*/ // ostream operator to handle string representation of a package /*{{{*/ // --------------------------------------------------------------------- @@ -978,7 +978,7 @@ string pkgCache::PkgFileIterator::RelStr() /*}}}*/ // VerIterator::TranslatedDescription - Return the a DescIter for locale/*{{{*/ // --------------------------------------------------------------------- -/* return a DescIter for the current locale or the default if none is +/* return a DescIter for the current locale or the default if none is * found */ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const @@ -1012,7 +1012,7 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const if (strcmp(Desc.LanguageCode(), "") == 0) return Desc; return DescriptionList(); -}; +} /*}}}*/ // PrvIterator::IsMultiArchImplicit - added by the cache generation /*{{{*/ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 669904c84..9a88246a1 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -176,13 +176,13 @@ class pkgCache /*{{{*/ char *StrP; virtual bool ReMap(bool const &Errorchecks = true); - inline bool Sync() {return Map.Sync();}; - inline MMap &GetMap() {return Map;}; - inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}; + inline bool Sync() {return Map.Sync();} + inline MMap &GetMap() {return Map;} + inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();} // String hashing function (512 range) - inline unsigned long Hash(const std::string &S) const {return sHash(S);}; - inline unsigned long Hash(const char *S) const {return sHash(S);}; + inline unsigned long Hash(const std::string &S) const {return sHash(S);} + inline unsigned long Hash(const char *S) const {return sHash(S);} // Useful transformation things const char *Priority(unsigned char Priority); @@ -192,7 +192,7 @@ class pkgCache /*{{{*/ PkgIterator FindPkg(const std::string &Name); PkgIterator FindPkg(const std::string &Name, const std::string &Arch); - Header &Head() {return *HeaderP;}; + Header &Head() {return *HeaderP;} inline GrpIterator GrpBegin(); inline GrpIterator GrpEnd(); inline PkgIterator PkgBegin(); @@ -200,7 +200,7 @@ class pkgCache /*{{{*/ inline PkgFileIterator FileBegin(); inline PkgFileIterator FileEnd(); - inline bool MultiArchCache() const { return MultiArchEnabled; }; + inline bool MultiArchCache() const { return MultiArchEnabled; } inline char const * const NativeArch() const; // Make me a function @@ -212,7 +212,7 @@ class pkgCache /*{{{*/ static const char *DepType(unsigned char Dep); pkgCache(MMap *Map,bool DoMap = true); - virtual ~pkgCache() {}; + virtual ~pkgCache() {} private: bool MultiArchEnabled; @@ -662,26 +662,26 @@ struct pkgCache::StringItem inline char const * const pkgCache::NativeArch() const - { return StrP + HeaderP->Architecture; }; + { return StrP + HeaderP->Architecture; } #include <apt-pkg/cacheiterators.h> -inline pkgCache::GrpIterator pkgCache::GrpBegin() - {return GrpIterator(*this);}; -inline pkgCache::GrpIterator pkgCache::GrpEnd() - {return GrpIterator(*this,GrpP);}; -inline pkgCache::PkgIterator pkgCache::PkgBegin() - {return PkgIterator(*this);}; -inline pkgCache::PkgIterator pkgCache::PkgEnd() - {return PkgIterator(*this,PkgP);}; +inline pkgCache::GrpIterator pkgCache::GrpBegin() + {return GrpIterator(*this);} +inline pkgCache::GrpIterator pkgCache::GrpEnd() + {return GrpIterator(*this,GrpP);} +inline pkgCache::PkgIterator pkgCache::PkgBegin() + {return PkgIterator(*this);} +inline pkgCache::PkgIterator pkgCache::PkgEnd() + {return PkgIterator(*this,PkgP);} inline pkgCache::PkgFileIterator pkgCache::FileBegin() - {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);}; + {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);} inline pkgCache::PkgFileIterator pkgCache::FileEnd() - {return PkgFileIterator(*this,PkgFileP);}; + {return PkgFileIterator(*this,PkgFileP);} // Oh I wish for Real Name Space Support class pkgCache::Namespace /*{{{*/ -{ +{ public: typedef pkgCache::GrpIterator GrpIterator; typedef pkgCache::PkgIterator PkgIterator; @@ -690,7 +690,7 @@ class pkgCache::Namespace /*{{{*/ typedef pkgCache::DepIterator DepIterator; typedef pkgCache::PrvIterator PrvIterator; typedef pkgCache::PkgFileIterator PkgFileIterator; - typedef pkgCache::VerFileIterator VerFileIterator; + typedef pkgCache::VerFileIterator VerFileIterator; typedef pkgCache::Version Version; typedef pkgCache::Description Description; typedef pkgCache::Package Package; diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h index c4973472f..436d38300 100644 --- a/apt-pkg/upgrade.h +++ b/apt-pkg/upgrade.h @@ -15,7 +15,7 @@ namespace APT { // FIXME: make this "enum class UpgradeMode {" once we enable c++11 enum UpgradeMode { FORBID_REMOVE_PACKAGES = 1, - FORBID_INSTALL_NEW_PACKAGES = 2, + FORBID_INSTALL_NEW_PACKAGES = 2 }; bool Upgrade(pkgDepCache &Cache, int UpgradeMode); } diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index d25ffef75..66e1600f1 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -42,12 +42,12 @@ AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) // AcqTextStatus::Start - Downloading has started /*{{{*/ // --------------------------------------------------------------------- /* */ -void AcqTextStatus::Start() +void AcqTextStatus::Start() { - pkgAcquireStatus::Start(); + pkgAcquireStatus::Start(); BlankLine[0] = 0; ID = 1; -}; +} /*}}}*/ // AcqTextStatus::IMSHit - Called when an item got a HIT response /*{{{*/ // --------------------------------------------------------------------- @@ -58,14 +58,14 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm) return; if (Quiet <= 0) - cout << '\r' << BlankLine << '\r'; - + cout << '\r' << BlankLine << '\r'; + cout << _("Hit ") << Itm.Description; if (Itm.Owner->FileSize != 0) cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]"; cout << endl; Update = true; -}; +} /*}}}*/ // AcqTextStatus::Fetch - An item has started to download /*{{{*/ // --------------------------------------------------------------------- @@ -75,20 +75,20 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm) Update = true; if (Itm.Owner->Complete == true) return; - + Itm.Owner->ID = ID++; - + if (Quiet > 1) return; if (Quiet <= 0) cout << '\r' << BlankLine << '\r'; - + cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description; if (Itm.Owner->FileSize != 0) cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]"; cout << endl; -}; +} /*}}}*/ // AcqTextStatus::Done - Completed a download /*{{{*/ // --------------------------------------------------------------------- @@ -96,7 +96,7 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm) void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm) { Update = true; -}; +} /*}}}*/ // AcqTextStatus::Fail - Called when an item fails to download /*{{{*/ // --------------------------------------------------------------------- @@ -109,10 +109,10 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm) // Ignore certain kinds of transient failures (bad code) if (Itm.Owner->Status == pkgAcquire::Item::StatIdle) return; - + if (Quiet <= 0) cout << '\r' << BlankLine << '\r'; - + if (Itm.Owner->Status == pkgAcquire::Item::StatDone) { cout << _("Ign ") << Itm.Description << endl; @@ -122,9 +122,9 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm) cout << _("Err ") << Itm.Description << endl; cout << " " << Itm.Owner->ErrorText << endl; } - + Update = true; -}; +} /*}}}*/ // AcqTextStatus::Stop - Finished downloading /*{{{*/ // --------------------------------------------------------------------- @@ -154,12 +154,12 @@ void AcqTextStatus::Stop() bool AcqTextStatus::Pulse(pkgAcquire *Owner) { pkgAcquireStatus::Pulse(Owner); - + if (Quiet > 0) return true; - + enum {Long = 0,Medium,Short} Mode = Medium; - + char Buffer[sizeof(BlankLine)]; char *End = Buffer + sizeof(Buffer); char *S = Buffer; @@ -174,8 +174,8 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) I = Owner->WorkerStep(I)) { S += strlen(S); - - // There is no item running + + // There is no item running if (I->CurrentItem == 0) { if (I->Status.empty() == false) @@ -183,12 +183,12 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) snprintf(S,End-S," [%s]",I->Status.c_str()); Shown = true; } - + continue; } Shown = true; - + // Add in the short description if (I->CurrentItem->Owner->ID != 0) snprintf(S,End-S," [%lu %s",I->CurrentItem->Owner->ID, @@ -203,7 +203,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) snprintf(S,End-S," %s",I->CurrentItem->Owner->Mode); S += strlen(S); } - + // Add the current progress if (Mode == Long) snprintf(S,End-S," %llu",I->CurrentSize); @@ -213,7 +213,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str()); } S += strlen(S); - + // Add the total size and percent if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false) { @@ -223,7 +223,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) else snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(), (I->CurrentSize*100.0)/I->TotalSize); - } + } S += strlen(S); snprintf(S,End-S,"]"); } @@ -231,26 +231,26 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) // Show something.. if (Shown == false) snprintf(S,End-S,_(" [Working]")); - + /* Put in the ETA and cps meter, block off signals to prevent strangeness during resizing */ sigset_t Sigs,OldSigs; sigemptyset(&Sigs); sigaddset(&Sigs,SIGWINCH); sigprocmask(SIG_BLOCK,&Sigs,&OldSigs); - + if (CurrentCPS != 0) - { + { char Tmp[300]; unsigned long long ETA = (TotalBytes - CurrentBytes)/CurrentCPS; sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str()); unsigned int Len = strlen(Buffer); unsigned int LenT = strlen(Tmp); if (Len + LenT < ScreenWidth) - { + { memset(Buffer + Len,' ',ScreenWidth - Len); strcpy(Buffer + ScreenWidth - LenT,Tmp); - } + } } Buffer[ScreenWidth] = 0; BlankLine[ScreenWidth] = 0; @@ -268,7 +268,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) memset(BlankLine,' ',strlen(Buffer)); BlankLine[strlen(Buffer)] = 0; - + Update = false; return true; diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 20c6e8892..9aaebefd7 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -54,7 +54,7 @@ class pkgCdromTextStatus : public pkgCdromStatus /*{{{*/ { protected: OpTextProgress Progress; - void Prompt(const char *Text); + void Prompt(const char *Text); string PromptLine(const char *Text); bool AskCdromName(string &name); @@ -64,12 +64,12 @@ public: virtual OpProgress* GetOpProgress(); }; -void pkgCdromTextStatus::Prompt(const char *Text) +void pkgCdromTextStatus::Prompt(const char *Text) { char C; cout << Text << ' ' << flush; if (read(STDIN_FILENO,&C,1) < 0) - _error->Errno("pkgCdromTextStatus::Prompt", + _error->Errno("pkgCdromTextStatus::Prompt", "Failed to read from standard input (not a terminal?)"); if (C != '\n') cout << endl; @@ -78,37 +78,37 @@ void pkgCdromTextStatus::Prompt(const char *Text) string pkgCdromTextStatus::PromptLine(const char *Text) { cout << Text << ':' << endl; - + string Res; getline(cin,Res); return Res; } -bool pkgCdromTextStatus::AskCdromName(string &name) +bool pkgCdromTextStatus::AskCdromName(string &name) { cout << _("Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'") << flush; name = PromptLine(""); - + return true; } - -void pkgCdromTextStatus::Update(string text, int current) + +void pkgCdromTextStatus::Update(string text, int current) { if(text.size() > 0) cout << text << flush; } -bool pkgCdromTextStatus::ChangeCdrom() +bool pkgCdromTextStatus::ChangeCdrom() { Prompt(_("Please insert a Disc in the drive and press enter")); return true; } -OpProgress* pkgCdromTextStatus::GetOpProgress() -{ - return &Progress; -}; +OpProgress* pkgCdromTextStatus::GetOpProgress() +{ + return &Progress; +} /*}}}*/ // SetupAutoDetect /*{{{*/ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted) diff --git a/ftparchive/override.cc b/ftparchive/override.cc index d2130db8a..82cbc4c19 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -201,7 +201,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source) } /*}}}*/ -// Override::GetItem - Get a architecture specific item /*{{{*/ +// Override::GetItem - Get a architecture specific item /*{{{*/ // --------------------------------------------------------------------- /* Returns a override item for the given package and the given architecture. * Treats "all" special @@ -232,10 +232,10 @@ Override::Item* Override::GetItem(string const &Package, string const &Architect { result->FieldOverride[foI->first] = foI->second; } - } - } + } + } return result; -}; +} // Override::Item::SwapMaint - Swap the maintainer field if necessary /*{{{*/ diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 22d4b9164..3c14d9dfb 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -62,7 +62,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | MountedByApt(false) { UdevCdroms.Dlopen(); -}; +} /*}}}*/ // CDROMMethod::Exit - Unmount the disc if necessary /*{{{*/ // --------------------------------------------------------------------- diff --git a/methods/http.cc b/methods/http.cc index 42b31beeb..16c6d19e1 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -61,7 +61,7 @@ unsigned long long CircleBuf::BwReadLimit=0; unsigned long long CircleBuf::BwTickReadData=0; struct timeval CircleBuf::BwReadTick={0,0}; const unsigned int CircleBuf::BW_HZ=10; - + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -87,8 +87,8 @@ void CircleBuf::Reset() { delete Hash; Hash = new Hashes; - } -}; + } +} /*}}}*/ // CircleBuf::Read - Read from a FD into the circular buffer /*{{{*/ // --------------------------------------------------------------------- diff --git a/methods/https.cc b/methods/https.cc index febe6a0f0..b0c7ee71d 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -432,7 +432,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) delete File; return true; -}; +} int main() { diff --git a/methods/mirror.cc b/methods/mirror.cc index 085f3717b..977eddcf5 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -60,7 +60,7 @@ using namespace std; MirrorMethod::MirrorMethod() : HttpMethod(), DownloadedMirrorFile(false), Debug(false) { -}; +} // HttpMethod::Configuration - Handle a configuration message /*{{{*/ // --------------------------------------------------------------------- @@ -90,17 +90,17 @@ bool MirrorMethod::Clean(string Dir) pkgSourceList list; list.ReadMainList(); - DIR *D = opendir(Dir.c_str()); + DIR *D = opendir(Dir.c_str()); if (D == 0) return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); - + string StartDir = SafeGetCWD(); if (chdir(Dir.c_str()) != 0) { closedir(D); return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str()); } - + for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D)) { // Skip some files.. @@ -123,23 +123,23 @@ bool MirrorMethod::Clean(string Dir) // nothing found, nuke it if (I == list.end()) unlink(Dir->d_name); - }; + } closedir(D); if (chdir(StartDir.c_str()) != 0) return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str()); - return true; + return true; } bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) { - // not that great to use pkgAcquire here, but we do not have + // not that great to use pkgAcquire here, but we do not have // any other way right now string fetch = BaseUri; fetch.replace(0,strlen("mirror://"),"http://"); -#if 0 // no need for this, the getArchitectures() will also include the main +#if 0 // no need for this, the getArchitectures() will also include the main // arch // append main architecture fetch += "?arch=" + _config->Find("Apt::Architecture"); @@ -173,7 +173,7 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) if(Debug) clog << "MirrorMethod::DownloadMirrorFile() success: " << res << endl; - + return res; } @@ -187,13 +187,13 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file) if (!FileExists(mirror_file)) return false; - // read + // read ifstream in(mirror_file.c_str()); while ( !in.eof() ) { getline(in, line); content.push_back(line); } - + // we want the file to be random for each different machine, but also // "stable" on the same machine. this is to avoid running into out-of-sync // issues (i.e. Release/Release.gpg different on each mirror) @@ -422,10 +422,10 @@ bool MirrorMethod::Fetch(FetchItem *Itm) if(Debug) clog << "Fetch: " << Itm->Uri << endl << endl; - + // now run the real fetcher return HttpMethod::Fetch(Itm); -}; +} void MirrorMethod::Fail(string Err,bool Transient) { @@ -437,7 +437,7 @@ void MirrorMethod::Fail(string Err,bool Transient) // try the next mirror on fail (if its not a expected failure, // e.g. translations are ok to ignore) - if (!Queue->FailIgnore && TryNextMirror()) + if (!Queue->FailIgnore && TryNextMirror()) return; // all mirrors failed, so bail out diff --git a/methods/rsh.cc b/methods/rsh.cc index 550f77eca..f065f6b89 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -368,7 +368,7 @@ RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig) signal(SIGINT,SigTerm); Server = 0; FailFd = -1; -}; +} /*}}}*/ // RSHMethod::Configuration - Handle a configuration message /*{{{*/ // --------------------------------------------------------------------- diff --git a/methods/server.cc b/methods/server.cc index ef90c809c..90e83d1af 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -119,10 +119,10 @@ bool ServerState::HeaderLine(string Line) string::size_type Pos2 = Pos; while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0) Pos2++; - + string Tag = string(Line,0,Pos); string Val = string(Line,Pos2); - + if (stringcasecmp(Tag.c_str(),Tag.c_str()+4,"HTTP") == 0) { // Evil servers return no version @@ -159,14 +159,14 @@ bool ServerState::HeaderLine(string Line) } return true; - } - + } + if (stringcasecmp(Tag,"Content-Length:") == 0) { if (Encoding == Closes) Encoding = Stream; HaveContent = true; - + // The length is already set from the Content-Range header if (StartPos != 0) return true; @@ -184,7 +184,7 @@ bool ServerState::HeaderLine(string Line) HaveContent = true; return true; } - + if (stringcasecmp(Tag,"Content-Range:") == 0) { HaveContent = true; @@ -201,12 +201,12 @@ bool ServerState::HeaderLine(string Line) return _error->Error(_("This HTTP server has broken range support")); return true; } - + if (stringcasecmp(Tag,"Transfer-Encoding:") == 0) { HaveContent = true; if (stringcasecmp(Val,"chunked") == 0) - Encoding = Chunked; + Encoding = Chunked; return true; } @@ -218,7 +218,7 @@ bool ServerState::HeaderLine(string Line) Persistent = true; return true; } - + if (stringcasecmp(Tag,"Last-Modified:") == 0) { if (RFC1123StrToTime(Val.c_str(), Date) == false) @@ -413,7 +413,7 @@ bool ServerMethod::Fetch(FetchItem *) } return true; -}; +} /*}}}*/ // ServerMethod::Loop - Main loop /*{{{*/ int ServerMethod::Loop() diff --git a/methods/server.h b/methods/server.h index 2b81e6173..f1db9adf7 100644 --- a/methods/server.h +++ b/methods/server.h @@ -62,7 +62,7 @@ struct ServerState /** \brief IO error while retrieving */ RUN_HEADERS_IO_ERROR, /** \brief Parse error after retrieving */ - RUN_HEADERS_PARSE_ERROR, + RUN_HEADERS_PARSE_ERROR }; /** \brief Get the headers before the data */ RunHeadersResult RunHeaders(FileFd * const File); -- cgit v1.2.3 From 3de8f956d5fcf023ab65f88579cd77121694d872 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 27 Feb 2014 01:26:29 +0100 Subject: StartPos is always positive for http/https MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit server.cc: In member function ‘bool ServerState::HeaderLine(std::string)’: server.cc:198:72: warning: format ‘%llu’ expects argument of type ‘long long unsigned int*’, but argument 3 has type ‘long long int*’ [-Wformat=] else if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2) Git-Dch: Ignore Reported-By: gcc -Wpedantic --- methods/http.cc | 9 ++------- methods/server.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/methods/http.cc b/methods/http.cc index 16c6d19e1..e1bb2e130 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -484,13 +484,8 @@ bool HttpServerState::InitHashes(FileFd &File) /*{{{*/ In.Hash = new Hashes; // Set the expected size and read file for the hashes - if (StartPos >= 0) - { - File.Truncate(StartPos); - - return In.Hash->AddFD(File, StartPos); - } - return true; + File.Truncate(StartPos); + return In.Hash->AddFD(File, StartPos); } /*}}}*/ Hashes * HttpServerState::GetHashes() /*{{{*/ diff --git a/methods/server.h b/methods/server.h index f1db9adf7..b4870698f 100644 --- a/methods/server.h +++ b/methods/server.h @@ -32,7 +32,7 @@ struct ServerState // These are some statistics from the last parsed header lines unsigned long long Size; - signed long long StartPos; + unsigned long long StartPos; time_t Date; bool HaveContent; enum {Chunked,Stream,Closes} Encoding; -- cgit v1.2.3 From cf4ff3b78dc347188949370db914fe6329be6c99 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 27 Feb 2014 01:54:10 +0100 Subject: warning: cast from type A to type B casts away qualifiers [-Wcast-qual] Git-Dch: Ignore Reported-By: gcc -Wcast-qual --- apt-inst/contrib/extracttar.cc | 6 +++--- apt-pkg/cacheiterators.h | 2 +- apt-pkg/contrib/fileutl.cc | 4 ++-- apt-pkg/contrib/hashes.h | 2 +- apt-pkg/contrib/hashsum_template.h | 42 +++++++++++++++++++------------------- apt-pkg/pkgcachegen.cc | 14 ++++++------- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 41301d1a6..41c509809 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -120,7 +120,7 @@ bool ExtractTar::StartGzip() int Pipes[2]; if (pipe(Pipes) != 0) return _error->Errno("pipe",_("Failed to create pipes")); - + // Fork off the process GZPid = ExecFork(); @@ -136,9 +136,9 @@ bool ExtractTar::StartGzip() dup2(Fd,STDERR_FILENO); close(Fd); SetCloseExec(STDOUT_FILENO,false); - SetCloseExec(STDIN_FILENO,false); + SetCloseExec(STDIN_FILENO,false); SetCloseExec(STDERR_FILENO,false); - + const char *Args[3]; string confvar = string("dir::bin::") + DecompressProg; string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str()); diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index ca8bc5ca0..64fec5daa 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -79,7 +79,7 @@ template<typename Str, typename Itr> class pkgCache::Iterator : void ReMap(void const * const oldMap, void const * const newMap) { if (Owner == 0 || S == 0) return; - S += (Str*)(newMap) - (Str*)(oldMap); + S += (Str const * const)(newMap) - (Str const * const)(oldMap); } // Constructors - look out for the variable assigning diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 52411a762..17833f090 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1400,7 +1400,7 @@ bool FileFd::Write(const void *From,unsigned long long Size) return FileFdErrno("write",_("Write error")); } - From = (char *)From + Res; + From = (char const *)From + Res; Size -= Res; if (d != NULL) d->seekpos += Res; @@ -1424,7 +1424,7 @@ bool FileFd::Write(int Fd, const void *From, unsigned long long Size) if (Res < 0) return _error->Errno("write",_("Write error")); - From = (char *)From + Res; + From = (char const *)From + Res; Size -= Res; } while (Res > 0 && Size > 0); diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 0a8bcd259..636cad257 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -77,7 +77,7 @@ class Hashes { return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size); }; - inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));}; + inline bool Add(const char *Data) {return Add((unsigned char const *)Data,strlen(Data));}; inline bool AddFD(int const Fd,unsigned long long Size = 0) { return AddFD(Fd, Size, true, true, true, true); }; bool AddFD(int const Fd, unsigned long long Size, bool const addMD5, diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index 9bf160b2b..97b6a4ad9 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -28,18 +28,18 @@ template<int N> class HashSumValue { unsigned char Sum[N/8]; - + public: // Accessors bool operator ==(const HashSumValue &rhs) const { return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0; - }; + } bool operator !=(const HashSumValue &rhs) const { return memcmp(Sum,rhs.Sum,sizeof(Sum)) != 0; - }; + } std::string Value() const { @@ -49,7 +49,7 @@ class HashSumValue }; char Result[((N/8)*2)+1]; Result[(N/8)*2] = 0; - + // Convert each char into two letters int J = 0; int I = 0; @@ -59,31 +59,31 @@ class HashSumValue Result[I + 1] = Conv[Sum[J] & 0xF]; } return std::string(Result); - }; - + } + inline void Value(unsigned char S[N/8]) { - for (int I = 0; I != sizeof(Sum); I++) + for (int I = 0; I != sizeof(Sum); ++I) S[I] = Sum[I]; - }; + } - inline operator std::string() const + inline operator std::string() const { return Value(); - }; + } - bool Set(std::string Str) + bool Set(std::string Str) { return Hex2Num(Str,Sum,sizeof(Sum)); - }; + } - inline void Set(unsigned char S[N/8]) + inline void Set(unsigned char S[N/8]) { - for (int I = 0; I != sizeof(Sum); I++) + for (int I = 0; I != sizeof(Sum); ++I) Sum[I] = S[I]; - }; + } - HashSumValue(std::string Str) + HashSumValue(std::string Str) { memset(Sum,0,sizeof(Sum)); Set(Str); @@ -99,17 +99,17 @@ class SummationImplementation public: virtual bool Add(const unsigned char *inbuf, unsigned long long inlen) = 0; inline bool Add(const char *inbuf, unsigned long long const inlen) - { return Add((unsigned char *)inbuf, inlen); }; + { return Add((const unsigned char *)inbuf, inlen); } inline bool Add(const unsigned char *Data) - { return Add(Data, strlen((const char *)Data)); }; + { return Add(Data, strlen((const char *)Data)); } inline bool Add(const char *Data) - { return Add((const unsigned char *)Data, strlen((const char *)Data)); }; + { return Add((const unsigned char *)Data, strlen((const char *)Data)); } inline bool Add(const unsigned char *Beg, const unsigned char *End) - { return Add(Beg, End - Beg); }; + { return Add(Beg, End - Beg); } inline bool Add(const char *Beg, const char *End) - { return Add((const unsigned char *)Beg, End - Beg); }; + { return Add((const unsigned char *)Beg, End - Beg); } bool AddFD(int Fd, unsigned long long Size = 0); bool AddFD(FileFd &Fd, unsigned long long Size = 0); diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 7ce7aba7b..96b35f669 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -118,11 +118,11 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM Cache.ReMap(false); - CurrentFile += (pkgCache::PackageFile*) newMap - (pkgCache::PackageFile*) oldMap; + CurrentFile += (pkgCache::PackageFile const * const) newMap - (pkgCache::PackageFile const * const) oldMap; for (size_t i = 0; i < _count(UniqHash); ++i) if (UniqHash[i] != 0) - UniqHash[i] += (pkgCache::StringItem*) newMap - (pkgCache::StringItem*) oldMap; + UniqHash[i] += (pkgCache::StringItem const * const) newMap - (pkgCache::StringItem const * const) oldMap; for (std::vector<pkgCache::GrpIterator*>::const_iterator i = Dynamic<pkgCache::GrpIterator>::toReMap.begin(); i != Dynamic<pkgCache::GrpIterator>::toReMap.end(); ++i) @@ -398,7 +398,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator Pkg.Name(), "NewVersion", 1); if (oldMap != Map.Data()) - LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + LastVer += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap; *LastVer = verindex; if (unlikely(List.NewVersion(Ver) == false)) @@ -909,7 +909,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, if (unlikely(index == 0)) return false; if (OldDepLast != 0 && oldMap != Map.Data()) - OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + OldDepLast += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap; } } return NewDepends(Pkg, Ver, index, Op, Type, OldDepLast); @@ -948,7 +948,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D) OldDepLast = &D->NextDepends; } else if (oldMap != Map.Data()) - OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + OldDepLast += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap; Dep->NextDepends = *OldDepLast; *OldDepLast = Dep.Index(); @@ -1125,8 +1125,8 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, if (unlikely(idxString == 0)) return 0; if (oldMap != Map.Data()) { - Last += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; - I += (pkgCache::StringItem*) Map.Data() - (pkgCache::StringItem*) oldMap; + Last += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap; + I += (pkgCache::StringItem const * const) Map.Data() - (pkgCache::StringItem const * const) oldMap; } *Last = Item; -- cgit v1.2.3 From e788a834ce421042e727b72e43177edaa47e53a7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 27 Feb 2014 02:18:11 +0100 Subject: warning: useless cast to type A [-Wuseless-cast] Git-Dch: Ignore Reported-By: gcc -Wuseless-cast --- apt-pkg/acquire-item.cc | 12 ++++++------ apt-pkg/algorithms.cc | 4 ++-- apt-pkg/cdrom.cc | 8 ++++---- apt-pkg/contrib/fileutl.cc | 4 ++-- apt-pkg/contrib/hashsum_template.h | 2 +- apt-pkg/contrib/mmap.cc | 2 +- apt-pkg/contrib/netrc.cc | 2 +- apt-pkg/deb/debsrcrecords.cc | 2 +- apt-pkg/indexcopy.cc | 12 ++++++------ apt-pkg/indexrecords.cc | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index de03011bf..88b10d4b1 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -709,7 +709,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ } // queue the right diff - Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz"; + Desc.URI = RealURI + ".diff/" + available_patches[0].file + ".gz"; Desc.Description = Description + " " + available_patches[0].file + string(".pdiff"); DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file); @@ -797,7 +797,7 @@ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner, Desc.Owner = this; Desc.ShortDesc = ShortDesc; - Desc.URI = string(RealURI) + ".diff/" + patch.file + ".gz"; + Desc.URI = RealURI + ".diff/" + patch.file + ".gz"; Desc.Description = Description + " " + patch.file + string(".pdiff"); DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(RealURI + ".diff/" + patch.file); @@ -1558,7 +1558,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ { std::vector<std::string> types = APT::Configuration::getCompressionTypes(); for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t) - if (MetaIndexParser->Exists(string((*Target)->MetaKey).append(".").append(*t)) == true) + if (MetaIndexParser->Exists((*Target)->MetaKey + "." + *t) == true) { compressedAvailable = true; break; @@ -1596,7 +1596,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ else if (transInRelease == false || Record != NULL || compressedAvailable == true) { if (_config->FindB("Acquire::PDiffs",true) == true && transInRelease == true && - MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true) + MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true) new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); else @@ -1610,7 +1610,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ in the Meta-Index file. Ideal would be if pkgAcqDiffIndex would test this instead, but passing the required info to it is to much hassle */ if(_config->FindB("Acquire::PDiffs",true) == true && (verify == false || - MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true)) + MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true)) new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); else @@ -1635,7 +1635,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ missingkeys += (Fingerprint); } if(!missingkeys.empty()) - _error->Warning("%s", string(msg+missingkeys).c_str()); + _error->Warning("%s", (msg + missingkeys).c_str()); string Transformed = MetaIndexParser->GetExpectedDist(); diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 8320e7ef0..2e167119d 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -885,8 +885,8 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } if (Debug == true) - clog << " Considering " << Pkg.FullName(false) << ' ' << (int)Scores[Pkg->ID] << - " as a solution to " << I.FullName(false) << ' ' << (int)Scores[I->ID] << endl; + clog << " Considering " << Pkg.FullName(false) << ' ' << Scores[Pkg->ID] << + " as a solution to " << I.FullName(false) << ' ' << Scores[I->ID] << endl; /* Try to fix the package under consideration rather than fiddle with the VList package */ diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 838c8887a..ea5ed7e92 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -440,7 +440,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf) Out.close(); if (FileExists(DFile) == true) - rename(DFile.c_str(), string(DFile + '~').c_str()); + rename(DFile.c_str(), (DFile + '~').c_str()); if (rename(NewFile.c_str(),DFile.c_str()) != 0) return _error->Errno("rename","Failed to rename %s.new to %s", DFile.c_str(),DFile.c_str()); @@ -553,7 +553,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source) Out.close(); - rename(File.c_str(),string(File + '~').c_str()); + rename(File.c_str(), (File + '~').c_str()); if (rename(NewFile.c_str(),File.c_str()) != 0) return _error->Errno("rename","Failed to rename %s.new to %s", File.c_str(),File.c_str()); @@ -737,7 +737,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if (InfoDir.empty() == false && FileExists(InfoDir + "/info") == true) { - ifstream F(string(InfoDir + "/info").c_str()); + ifstream F((InfoDir + "/info").c_str()); if (!F == 0) getline(F,Name); @@ -981,7 +981,7 @@ pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly) cdrom.DeviceName = string(devnode); if (mountpath != "") { cdrom.MountPath = mountpath; - string s = string(mountpath); + string s = mountpath; cdrom.Mounted = IsMounted(s); } else { cdrom.Mounted = false; diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 17833f090..464950abd 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -891,7 +891,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, { for (; compressor != compressors.end(); ++compressor) { - std::string file = std::string(FileName).append(compressor->Extension); + std::string file = FileName + compressor->Extension; if (FileExists(file) == false) continue; FileName = file; @@ -1793,7 +1793,7 @@ bool FileFd::FileFdError(const char *Description,...) { } /*}}}*/ -gzFile FileFd::gzFd() { return (gzFile) d->gz; } +gzFile FileFd::gzFd() { return d->gz; } // Glob - wrapper around "glob()" /*{{{*/ diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index 97b6a4ad9..f96188eb8 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -104,7 +104,7 @@ class SummationImplementation inline bool Add(const unsigned char *Data) { return Add(Data, strlen((const char *)Data)); } inline bool Add(const char *Data) - { return Add((const unsigned char *)Data, strlen((const char *)Data)); } + { return Add((const unsigned char *)Data, strlen(Data)); } inline bool Add(const unsigned char *Beg, const unsigned char *End) { return Add(Beg, End - Beg); } diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 51e8eb30f..37acba340 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -198,7 +198,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) { #ifdef _POSIX_SYNCHRONIZED_IO unsigned long long const PSize = sysconf(_SC_PAGESIZE); - if (msync((char *)Base+(unsigned long long)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) + if (msync((char *)Base+(Start/PSize)*PSize, Stop - Start, MS_SYNC) < 0) return _error->Errno("msync", _("Unable to synchronize mmap")); #endif } diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index de95aa4ab..32b146581 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -198,7 +198,7 @@ void maybe_add_auth (URI &Uri, string NetRCFile) // if host did not work, try Host+Path next, this will trigger // a lookup uri.startswith(host) in the netrc file parser (because // of the "/" - char *hostpath = strdup(string(Uri.Host+Uri.Path).c_str()); + char *hostpath = strdup((Uri.Host + Uri.Path).c_str()); if (hostpath && parsenetrc_string(hostpath, login, password, netrcfile) == 0) { if (_config->FindB("Debug::Acquire::netrc", false) == true) diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 90182b4a4..daa54d036 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -57,7 +57,7 @@ const char **debSrcRecordParser::Binaries() } while (*bin != '\0'); StaticBinList.push_back(NULL); - return (const char **) &StaticBinList[0]; + return &StaticBinList[0]; } /*}}}*/ // SrcRecordParser::BuildDepends - Return the Build-Depends information /*{{{*/ diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 89c9d531f..38356df18 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -65,7 +65,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); c != compressor.end(); ++c) { - if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0) + if (stat((file + c->Extension).c_str(), &Buf) != 0) continue; found = true; break; @@ -160,7 +160,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, // Get the size struct stat Buf; - if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0 || + if (stat((CDROM + Prefix + File).c_str(),&Buf) != 0 || Buf.st_size == 0) { bool Mangled = false; @@ -175,7 +175,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, } if (Mangled == false || - stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0) + stat((CDROM + Prefix + File).c_str(),&Buf) != 0) { if (Debug == true) clog << "Missed(2): " << OrigFile << endl; @@ -286,7 +286,7 @@ bool IndexCopy::ReconstructPrefix(string &Prefix,string OrigPath,string CD, while (1) { struct stat Buf; - if (stat(string(CD + MyPrefix + File).c_str(),&Buf) != 0) + if (stat((CD + MyPrefix + File).c_str(),&Buf) != 0) { if (Debug == true) cout << "Failed, " << CD + MyPrefix + File << endl; @@ -315,7 +315,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File) while (1) { struct stat Buf; - if (stat(string(Dir + File).c_str(),&Buf) != 0) + if (stat((Dir + File).c_str(),&Buf) != 0) { File = ChopDirs(File,1); Depth++; @@ -676,7 +676,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); c != compressor.end(); ++c) { - if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0) + if (stat((file + c->Extension).c_str(), &Buf) != 0) continue; found = true; break; diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index f8097c3c6..c1c397e31 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -129,10 +129,10 @@ bool indexRecords::Load(const string Filename) /*{{{*/ // get the user settings for this archive and use what expires earlier int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0); if (Label.empty() == false) - MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge); + MaxAge = _config->FindI(("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge); int MinAge = _config->FindI("Acquire::Min-ValidTime", 0); if (Label.empty() == false) - MinAge = _config->FindI(string("Acquire::Min-ValidTime::" + Label).c_str(), MinAge); + MinAge = _config->FindI(("Acquire::Min-ValidTime::" + Label).c_str(), MinAge); if(MaxAge == 0 && (MinAge == 0 || ValidUntil == 0)) // No user settings, use the one from the Release file -- cgit v1.2.3 From c3ccac9232c2684b15f75fa8622a9a290aeca123 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 27 Feb 2014 03:11:54 +0100 Subject: warning: no previous declaration for foobar() [-Wmissing-declarations] Git-Dch: Ignore Reported-By: gcc -Wmissing-declarations --- apt-pkg/depcache.cc | 2 +- apt-private/private-cmndline.cc | 14 ++++----- apt-private/private-download.cc | 1 + apt-private/private-install.cc | 2 +- apt-private/private-list.cc | 2 +- apt-private/private-moo.cc | 4 +-- apt-private/private-output.cc | 16 +++++----- apt-private/private-show.cc | 3 +- apt-private/private-update.cc | 1 + cmdline/apt-cache.cc | 48 +++++++++++++++--------------- cmdline/apt-cdrom.cc | 8 ++--- cmdline/apt-config.cc | 6 ++-- cmdline/apt-dump-solver.cc | 2 +- cmdline/apt-extracttemplates.cc | 8 ++--- cmdline/apt-get.cc | 36 +++++++++++----------- cmdline/apt-helper.cc | 4 +-- cmdline/apt-internal-solver.cc | 2 +- cmdline/apt-mark.cc | 12 ++++---- cmdline/apt-sortpkgs.cc | 4 +-- cmdline/apt.cc | 2 +- debian/libapt-pkg4.12.symbols | 1 - ftparchive/apt-ftparchive.cc | 18 +++++------ test/interactive-helper/aptwebserver.cc | 30 +++++++++---------- test/interactive-helper/extract-control.cc | 2 +- test/interactive-helper/testdeb.cc | 2 +- test/libapt/assert.h | 9 ++++++ test/libapt/compareversion_test.cc | 6 ++-- test/libapt/sourcelist_test.cc | 2 +- test/libapt/tagfile_test.cc | 2 +- 29 files changed, 130 insertions(+), 119 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 90d0c9314..946c1e254 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -889,7 +889,7 @@ bool pkgDepCache::IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg, and prevents mode changes for packages on hold for example. If you want to check Mode specific stuff you can use the virtual public Is<Mode>Ok methods instead */ -char const* PrintMode(char const mode) +static char const* PrintMode(char const mode) { switch (mode) { diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index b99443210..132da04d5 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -14,7 +14,7 @@ #include <apti18n.h> /*}}}*/ -bool strcmp_match_in_list(char const * const Cmd, ...) /*{{{*/ +static bool strcmp_match_in_list(char const * const Cmd, ...) /*{{{*/ { va_list args; bool found = false; @@ -33,7 +33,7 @@ bool strcmp_match_in_list(char const * const Cmd, ...) /*{{{*/ /*}}}*/ #define addArg(w,x,y,z) Args.push_back(CommandLine::MakeArgs(w,x,y,z)) #define CmdMatches(...) strcmp_match_in_list(Cmd, __VA_ARGS__, NULL) -bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ +static bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("depends", "rdepends", "xvcg", "dotty")) { @@ -82,7 +82,7 @@ bool addArgumentsAPTCache(std::vector<CommandLine::Args> &Args, char const * con return true; } /*}}}*/ -bool addArgumentsAPTCDROM(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ +static bool addArgumentsAPTCDROM(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("add", "ident") == false) return false; @@ -100,7 +100,7 @@ bool addArgumentsAPTCDROM(std::vector<CommandLine::Args> &Args, char const * con return true; } /*}}}*/ -bool addArgumentsAPTConfig(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ +static bool addArgumentsAPTConfig(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("dump")) { @@ -115,7 +115,7 @@ bool addArgumentsAPTConfig(std::vector<CommandLine::Args> &Args, char const * co return true; } /*}}}*/ -bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ +static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", "dselect-upgrade", "autoremove")) @@ -202,7 +202,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const return true; } /*}}}*/ -bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ +static bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("auto", "manual", "hold", "unhold", "showauto", "showmanual", "showhold", "showholds", "install", @@ -222,7 +222,7 @@ bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * cons return true; } /*}}}*/ -bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ +static bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("list")) { diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index f02991cde..80795f964 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -8,6 +8,7 @@ #include <apt-pkg/strutl.h> #include "private-output.h" +#include "private-download.h" #include <locale.h> diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 3adb00b23..ff609f567 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -386,7 +386,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety) // DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ // --------------------------------------------------------------------- /* Remove unused automatic packages */ -bool DoAutomaticRemove(CacheFile &Cache) +static bool DoAutomaticRemove(CacheFile &Cache) { bool Debug = _config->FindI("Debug::pkgAutoRemove",false); bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index 44a766c84..bc4539aeb 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -99,7 +99,7 @@ private: #undef PackageMatcher }; /*}}}*/ -void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ +static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/ pkgCache::PkgIterator P, std::ostream &outs, bool include_summary=true) diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc index 23255db6f..5d247041d 100644 --- a/apt-private/private-moo.cc +++ b/apt-private/private-moo.cc @@ -22,7 +22,7 @@ #include <apti18n.h> /*}}}*/ -std::string getMooLine() { /*{{{*/ +static std::string getMooLine() { /*{{{*/ time_t const timenow = time(NULL); struct tm special; localtime_r(&timenow, &special); @@ -60,7 +60,7 @@ std::string getMooLine() { /*{{{*/ return out.str(); } /*}}}*/ -bool printMooLine() { /*{{{*/ +static bool printMooLine() { /*{{{*/ std::cerr << getMooLine() << std::endl; return true; } diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 420ca14d5..dec518392 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -63,7 +63,7 @@ bool InitOutput() /*{{{*/ return true; } /*}}}*/ -std::string GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver) /*{{{*/ +static std::string GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver) /*{{{*/ { std::string suite = ""; if (ver && ver.FileList() && ver.FileList()) @@ -82,7 +82,7 @@ std::string GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver) return suite; } /*}}}*/ -std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ +static std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ { pkgDepCache *DepCache = CacheFile.GetDepCache(); pkgDepCache::StateCache &state = (*DepCache)[P]; @@ -99,7 +99,7 @@ std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ return flags_str; } /*}}}*/ -std::string GetCandidateVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ +static std::string GetCandidateVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ { pkgPolicy *policy = CacheFile.GetPolicy(); pkgCache::VerIterator cand = policy->GetCandidateVer(P); @@ -107,14 +107,14 @@ std::string GetCandidateVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P return cand ? cand.VerStr() : "(none)"; } /*}}}*/ -std::string GetInstalledVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ +static std::string GetInstalledVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ { pkgCache::VerIterator inst = P.CurrentVer(); return inst ? inst.VerStr() : "(none)"; } /*}}}*/ -std::string GetVersion(pkgCacheFile &CacheFile, pkgCache::VerIterator V)/*{{{*/ +static std::string GetVersion(pkgCacheFile &CacheFile, pkgCache::VerIterator V)/*{{{*/ { pkgCache::PkgIterator P = V.ParentPkg(); if (V == P.CurrentVer()) @@ -134,16 +134,16 @@ std::string GetVersion(pkgCacheFile &CacheFile, pkgCache::VerIterator V)/*{{{*/ return "(none)"; } /*}}}*/ -std::string GetArchitecture(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ +static std::string GetArchitecture(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ { pkgPolicy *policy = CacheFile.GetPolicy(); pkgCache::VerIterator inst = P.CurrentVer(); pkgCache::VerIterator cand = policy->GetCandidateVer(P); - + return inst ? inst.Arch() : cand.Arch(); } /*}}}*/ -std::string GetShortDescription(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::PkgIterator P)/*{{{*/ +static std::string GetShortDescription(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::PkgIterator P)/*{{{*/ { pkgPolicy *policy = CacheFile.GetPolicy(); diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 0a69debbf..94f944af1 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -24,6 +24,7 @@ #include "private-output.h" #include "private-cacheset.h" +#include "private-show.h" /*}}}*/ namespace APT { @@ -31,7 +32,7 @@ namespace APT { // DisplayRecord - Displays the complete record for the package /*{{{*/ // --------------------------------------------------------------------- -bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, +static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, ostream &out) { pkgCache *Cache = CacheFile.GetPkgCache(); diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc index f6c12c26a..1f6fb6f79 100644 --- a/apt-private/private-update.cc +++ b/apt-private/private-update.cc @@ -31,6 +31,7 @@ #include "private-cachefile.h" #include "private-output.h" +#include "private-update.h" #include "acqprogress.h" #include <apti18n.h> diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 22778eb24..7e569f2fc 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -58,7 +58,7 @@ using namespace std; // LocalitySort - Sort a version list by package file locality /*{{{*/ // --------------------------------------------------------------------- /* */ -int LocalityCompare(const void *a, const void *b) +static int LocalityCompare(const void *a, const void *b) { pkgCache::VerFile *A = *(pkgCache::VerFile **)a; pkgCache::VerFile *B = *(pkgCache::VerFile **)b; @@ -75,13 +75,13 @@ int LocalityCompare(const void *a, const void *b) return A->File - B->File; } -void LocalitySort(pkgCache::VerFile **begin, +static void LocalitySort(pkgCache::VerFile **begin, unsigned long Count,size_t Size) { qsort(begin,Count,Size,LocalityCompare); } -void LocalitySort(pkgCache::DescFile **begin, +static void LocalitySort(pkgCache::DescFile **begin, unsigned long Count,size_t Size) { qsort(begin,Count,Size,LocalityCompare); @@ -90,7 +90,7 @@ void LocalitySort(pkgCache::DescFile **begin, // UnMet - Show unmet dependencies /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important) +static bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important) { bool Header = false; for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;) @@ -163,7 +163,7 @@ bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important) } return true; } -bool UnMet(CommandLine &CmdL) +static bool UnMet(CommandLine &CmdL) { bool const Important = _config->FindB("APT::Cache::Important",false); @@ -193,7 +193,7 @@ bool UnMet(CommandLine &CmdL) // DumpPackage - Show a dump of a package record /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DumpPackage(CommandLine &CmdL) +static bool DumpPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; APT::CacheSetHelper helper(true, GlobalError::NOTICE); @@ -258,7 +258,7 @@ bool DumpPackage(CommandLine &CmdL) // Stats - Dump some nice statistics /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Stats(CommandLine &Cmd) +static bool Stats(CommandLine &Cmd) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -371,7 +371,7 @@ bool Stats(CommandLine &Cmd) // Dump - show everything /*{{{*/ // --------------------------------------------------------------------- /* This is worthless except fer debugging things */ -bool Dump(CommandLine &Cmd) +static bool Dump(CommandLine &Cmd) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -423,7 +423,7 @@ bool Dump(CommandLine &Cmd) // --------------------------------------------------------------------- /* This is needed to make dpkg --merge happy.. I spent a bit of time to make this run really fast, perhaps I went a little overboard.. */ -bool DumpAvail(CommandLine &Cmd) +static bool DumpAvail(CommandLine &Cmd) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -562,7 +562,7 @@ bool DumpAvail(CommandLine &Cmd) } /*}}}*/ // ShowDepends - Helper for printing out a dependency tree /*{{{*/ -bool ShowDepends(CommandLine &CmdL, bool const RevDepends) +static bool ShowDepends(CommandLine &CmdL, bool const RevDepends) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -676,7 +676,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends) // Depends - Print out a dependency tree /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Depends(CommandLine &CmdL) +static bool Depends(CommandLine &CmdL) { return ShowDepends(CmdL, false); } @@ -684,7 +684,7 @@ bool Depends(CommandLine &CmdL) // RDepends - Print out a reverse dependency tree /*{{{*/ // --------------------------------------------------------------------- /* */ -bool RDepends(CommandLine &CmdL) +static bool RDepends(CommandLine &CmdL) { return ShowDepends(CmdL, true); } @@ -693,7 +693,7 @@ bool RDepends(CommandLine &CmdL) // --------------------------------------------------------------------- // Code contributed from Junichi Uekawa <dancer@debian.org> on 20 June 2002. -bool XVcg(CommandLine &CmdL) +static bool XVcg(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -905,7 +905,7 @@ bool XVcg(CommandLine &CmdL) /* Dotty is the graphvis program for generating graphs. It is a fairly simple queuing algorithm that just writes dependencies and nodes. http://www.research.att.com/sw/tools/graphviz/ */ -bool Dotty(CommandLine &CmdL) +static bool Dotty(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -1126,7 +1126,7 @@ static unsigned char const* skipDescriptionFields(unsigned char const * DescP) ++DescP; return DescP; } -bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) +static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) { pkgCache *Cache = CacheFile.GetPkgCache(); if (unlikely(Cache == NULL)) @@ -1228,7 +1228,7 @@ struct ExDescFile // Search - Perform a search /*{{{*/ // --------------------------------------------------------------------- /* This searches the package names and package descriptions for a pattern */ -bool Search(CommandLine &CmdL) +static bool Search(CommandLine &CmdL) { bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false); bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); @@ -1388,7 +1388,7 @@ bool Search(CommandLine &CmdL) } /*}}}*/ /* ShowAuto - show automatically installed packages (sorted) {{{*/ -bool ShowAuto(CommandLine &CmdL) +static bool ShowAuto(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -1415,7 +1415,7 @@ bool ShowAuto(CommandLine &CmdL) // ShowPackage - Dump the package record to the screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowPackage(CommandLine &CmdL) +static bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); @@ -1439,7 +1439,7 @@ bool ShowPackage(CommandLine &CmdL) // ShowPkgNames - Show package names /*{{{*/ // --------------------------------------------------------------------- /* This does a prefix match on the first argument */ -bool ShowPkgNames(CommandLine &CmdL) +static bool ShowPkgNames(CommandLine &CmdL) { pkgCacheFile CacheFile; if (unlikely(CacheFile.BuildCaches(NULL, false) == false)) @@ -1478,7 +1478,7 @@ bool ShowPkgNames(CommandLine &CmdL) // ShowSrcPackage - Show source package records /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowSrcPackage(CommandLine &CmdL) +static bool ShowSrcPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgSourceList *List = CacheFile.GetSourceList(); @@ -1515,7 +1515,7 @@ bool ShowSrcPackage(CommandLine &CmdL) // Policy - Show the results of the preferences file /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Policy(CommandLine &CmdL) +static bool Policy(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -1644,7 +1644,7 @@ bool Policy(CommandLine &CmdL) // Madison - Look a bit like katie's madison /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Madison(CommandLine &CmdL) +static bool Madison(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgSourceList *SrcList = CacheFile.GetSourceList(); @@ -1717,7 +1717,7 @@ bool Madison(CommandLine &CmdL) // GenCaches - Call the main cache generator /*{{{*/ // --------------------------------------------------------------------- /* */ -bool GenCaches(CommandLine &Cmd) +static bool GenCaches(CommandLine &Cmd) { OpTextProgress Progress(*_config); @@ -1728,7 +1728,7 @@ bool GenCaches(CommandLine &Cmd) // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp(CommandLine &Cmd) +static bool ShowHelp(CommandLine &Cmd) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 9aaebefd7..dc0e050c3 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -111,7 +111,7 @@ OpProgress* pkgCdromTextStatus::GetOpProgress() } /*}}}*/ // SetupAutoDetect /*{{{*/ -bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted) +static bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted) { bool Debug = _config->FindB("Debug::Acquire::cdrom", false); @@ -155,7 +155,7 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &aut sequence is to mount/umount the CD, Ident it then scan it for package files and reduce that list. Then we copy over the package files and verify them. Then rewrite the database files */ -bool DoAdd(CommandLine &) +static bool DoAdd(CommandLine &) { pkgUdevCdromDevices UdevCdroms; pkgCdromTextStatus log; @@ -201,7 +201,7 @@ bool DoAdd(CommandLine &) // DoIdent - Ident a CDROM /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoIdent(CommandLine &) +static bool DoIdent(CommandLine &) { pkgUdevCdromDevices UdevCdroms; string ident; @@ -247,7 +247,7 @@ bool DoIdent(CommandLine &) // ShowHelp - Show the help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp(CommandLine &) +static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 9f20b3c1b..e83c4b64b 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -40,7 +40,7 @@ using namespace std; // DoShell - Handle the shell command /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoShell(CommandLine &CmdL) +static bool DoShell(CommandLine &CmdL) { for (const char **I = CmdL.FileList + 1; *I != 0; I += 2) { @@ -63,7 +63,7 @@ bool DoShell(CommandLine &CmdL) // DoDump - Dump the configuration space /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoDump(CommandLine &CmdL) +static bool DoDump(CommandLine &CmdL) { bool const empty = _config->FindB("APT::Config::Dump::EmptyValue", true); std::string const format = _config->Find("APT::Config::Dump::Format", "%f \"%v\";\n"); @@ -78,7 +78,7 @@ bool DoDump(CommandLine &CmdL) // ShowHelp - Show the help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &CmdL) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc index aa16b1271..c26cdc70a 100644 --- a/cmdline/apt-dump-solver.cc +++ b/cmdline/apt-dump-solver.cc @@ -18,7 +18,7 @@ // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp() { +static bool ShowHelp() { std::cout << PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl << diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 2408a7d9d..2b01968e3 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -212,7 +212,7 @@ bool DebFile::ParseInfo() // ShowHelp - show a short help text /*{{{*/ // --------------------------------------------------------------------- /* */ -int ShowHelp(void) +static int ShowHelp(void) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); @@ -237,7 +237,7 @@ int ShowHelp(void) // WriteFile - write the contents of the passed string to a file /*{{{*/ // --------------------------------------------------------------------- /* */ -string WriteFile(const char *package, const char *prefix, const char *data) +static string WriteFile(const char *package, const char *prefix, const char *data) { char fn[512]; static int i; @@ -265,7 +265,7 @@ string WriteFile(const char *package, const char *prefix, const char *data) // WriteConfig - write out the config data from a debian package file /*{{{*/ // --------------------------------------------------------------------- /* */ -void WriteConfig(const DebFile &file) +static void WriteConfig(const DebFile &file) { string templatefile = WriteFile(file.Package.c_str(), "template", file.Template); string configscript = WriteFile(file.Package.c_str(), "config", file.Config); @@ -279,7 +279,7 @@ void WriteConfig(const DebFile &file) // InitCache - initialize the package cache /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Go(CommandLine &CmdL) +static bool Go(CommandLine &CmdL) { // Initialize the apt cache MMap *Map = 0; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index f8de80a91..253b2f4a5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -97,7 +97,7 @@ using namespace std; // --------------------------------------------------------------------- /* This used to be inlined in DoInstall, but with the advent of regex package name matching it was split out.. */ -bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, +static bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, bool AllowFail = true) { @@ -138,7 +138,7 @@ bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, // helper that can go wit hthe next ABI break #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) -std::string MetaIndexFileNameOnDisk(metaIndex *metaindex) +static std::string MetaIndexFileNameOnDisk(metaIndex *metaindex) { // FIXME: this cast is the horror, the horror debReleaseIndex *r = (debReleaseIndex*)metaindex; @@ -159,7 +159,7 @@ std::string MetaIndexFileNameOnDisk(metaIndex *metaindex) // GetReleaseForSourceRecord - Return Suite for the given srcrecord /*{{{*/ // --------------------------------------------------------------------- /* */ -std::string GetReleaseForSourceRecord(pkgSourceList *SrcList, +static std::string GetReleaseForSourceRecord(pkgSourceList *SrcList, pkgSrcRecords::Parser *Parse) { // try to find release @@ -194,7 +194,7 @@ std::string GetReleaseForSourceRecord(pkgSourceList *SrcList, // FindSrc - Find a source record /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, +static pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgSrcRecords &SrcRecs,string &Src, CacheFile &CacheFile) { @@ -430,7 +430,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, } /*}}}*/ /* mark packages as automatically/manually installed. {{{*/ -bool DoMarkAuto(CommandLine &CmdL) +static bool DoMarkAuto(CommandLine &CmdL) { bool Action = true; int AutoMarkChanged = 0; @@ -475,7 +475,7 @@ bool DoMarkAuto(CommandLine &CmdL) // DoDSelectUpgrade - Do an upgrade by following dselects selections /*{{{*/ // --------------------------------------------------------------------- /* Follows dselect's selections */ -bool DoDSelectUpgrade(CommandLine &CmdL) +static bool DoDSelectUpgrade(CommandLine &CmdL) { CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) @@ -551,7 +551,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) // DoClean - Remove download archives /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoClean(CommandLine &CmdL) +static bool DoClean(CommandLine &CmdL) { std::string const archivedir = _config->FindDir("Dir::Cache::archives"); std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache"); @@ -599,7 +599,7 @@ class LogCleaner : public pkgArchiveCleaner }; }; -bool DoAutoClean(CommandLine &CmdL) +static bool DoAutoClean(CommandLine &CmdL) { // Lock the archive directory FileFd Lock; @@ -623,7 +623,7 @@ bool DoAutoClean(CommandLine &CmdL) /*}}}*/ // DoDownload - download a binary /*{{{*/ // --------------------------------------------------------------------- -bool DoDownload(CommandLine &CmdL) +static bool DoDownload(CommandLine &CmdL) { CacheFile Cache; if (Cache.ReadOnlyOpen() == false) @@ -696,7 +696,7 @@ bool DoDownload(CommandLine &CmdL) // --------------------------------------------------------------------- /* Opening automatically checks the system, this command is mostly used for debugging */ -bool DoCheck(CommandLine &CmdL) +static bool DoCheck(CommandLine &CmdL) { CacheFile Cache; Cache.Open(); @@ -715,7 +715,7 @@ struct DscFile string Dsc; }; -bool DoSource(CommandLine &CmdL) +static bool DoSource(CommandLine &CmdL) { CacheFile Cache; if (Cache.Open(false) == false) @@ -1016,7 +1016,7 @@ bool DoSource(CommandLine &CmdL) // --------------------------------------------------------------------- /* This function will look at the build depends list of the given source package and install the necessary packages to make it true, or fail. */ -bool DoBuildDep(CommandLine &CmdL) +static bool DoBuildDep(CommandLine &CmdL) { CacheFile Cache; @@ -1410,7 +1410,7 @@ bool DoBuildDep(CommandLine &CmdL) * pool/ next to the deb itself) * Example return: "pool/main/a/apt/apt_0.8.8ubuntu3" */ -string GetChangelogPath(CacheFile &Cache, +static string GetChangelogPath(CacheFile &Cache, pkgCache::PkgIterator Pkg, pkgCache::VerIterator Ver) { @@ -1437,7 +1437,7 @@ string GetChangelogPath(CacheFile &Cache, * apt-get changelog mplayer-doc: * http://packages.medibuntu.org/pool/non-free/m/mplayer/mplayer_1.0~rc4~try1.dsfg1-1ubuntu1+medibuntu1.changelog */ -bool GuessThirdPartyChangelogUri(CacheFile &Cache, +static bool GuessThirdPartyChangelogUri(CacheFile &Cache, pkgCache::PkgIterator Pkg, pkgCache::VerIterator Ver, string &out_uri) @@ -1462,7 +1462,7 @@ bool GuessThirdPartyChangelogUri(CacheFile &Cache, /*}}}*/ // DownloadChangelog - Download the changelog /*{{{*/ // --------------------------------------------------------------------- -bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, +static bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, pkgCache::VerIterator Ver, string targetfile) /* Download a changelog file for the given package version to * targetfile. This will first try the server from Apt::Changelogs::Server @@ -1517,7 +1517,7 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher, /*}}}*/ // DoChangelog - Get changelog from the command line /*{{{*/ // --------------------------------------------------------------------- -bool DoChangelog(CommandLine &CmdL) +static bool DoChangelog(CommandLine &CmdL) { CacheFile Cache; if (Cache.ReadOnlyOpen() == false) @@ -1581,7 +1581,7 @@ bool DoChangelog(CommandLine &CmdL) // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &CmdL) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); @@ -1677,7 +1677,7 @@ bool ShowHelp(CommandLine &CmdL) // SigWinch - Window size change signal handler /*{{{*/ // --------------------------------------------------------------------- /* */ -void SigWinch(int) +static void SigWinch(int) { // Riped from GNU ls #ifdef TIOCGWINSZ diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index c1c8b2178..d8ea0435a 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -33,7 +33,7 @@ /*}}}*/ using namespace std; -bool DoDownloadFile(CommandLine &CmdL) +static bool DoDownloadFile(CommandLine &CmdL) { if (CmdL.FileSize() <= 2) return _error->Error(_("Must specify at least one pair url/filename")); @@ -55,7 +55,7 @@ bool DoDownloadFile(CommandLine &CmdL) return true; } -bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &CmdL) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index bf5b8c1fe..108e86b9a 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -30,7 +30,7 @@ // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp(CommandLine &CmdL) { +static bool ShowHelp(CommandLine &CmdL) { ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index d3a3a780b..1af17cd7a 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -35,7 +35,7 @@ ostream c1out(0); ostream c2out(0); ofstream devnull("/dev/null"); /* DoAuto - mark packages as automatically/manually installed {{{*/ -bool DoAuto(CommandLine &CmdL) +static bool DoAuto(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -82,7 +82,7 @@ bool DoAuto(CommandLine &CmdL) /* DoMarkAuto - mark packages as automatically/manually installed {{{*/ /* Does the same as DoAuto but tries to do it exactly the same why as the python implementation did it so it can be a drop-in replacement */ -bool DoMarkAuto(CommandLine &CmdL) +static bool DoMarkAuto(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -119,7 +119,7 @@ bool DoMarkAuto(CommandLine &CmdL) } /*}}}*/ /* ShowAuto - show automatically installed packages (sorted) {{{*/ -bool ShowAuto(CommandLine &CmdL) +static bool ShowAuto(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -159,7 +159,7 @@ bool ShowAuto(CommandLine &CmdL) } /*}}}*/ /* DoHold - mark packages as hold by dpkg {{{*/ -bool DoHold(CommandLine &CmdL) +static bool DoHold(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -335,7 +335,7 @@ bool DoHold(CommandLine &CmdL) } /*}}}*/ /* ShowHold - show packages set on hold in dpkg status {{{*/ -bool ShowHold(CommandLine &CmdL) +static bool ShowHold(CommandLine &CmdL) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -372,7 +372,7 @@ bool ShowHold(CommandLine &CmdL) // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &CmdL) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index 46989044e..8d9cb23de 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -62,7 +62,7 @@ struct PkgName /*{{{*/ // DoIt - Sort a single file /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoIt(string InFile) +static bool DoIt(string InFile) { FileFd Fd(InFile,FileFd::ReadOnly); pkgTagFile Tags(&Fd); @@ -142,7 +142,7 @@ bool DoIt(string InFile) // ShowHelp - Show the help text /*{{{*/ // --------------------------------------------------------------------- /* */ -int ShowHelp() +static int ShowHelp() { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 7ef9060aa..040ed6c25 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -61,7 +61,7 @@ -bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &CmdL) { ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 17b9f69fa..c1747bc9e 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1197,7 +1197,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12 (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13 (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2 - (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2 (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2 (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1 (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3 diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index d14b68044..c28ad5c5c 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -438,7 +438,7 @@ bool PackageMap::GenContents(Configuration &Setup, // --------------------------------------------------------------------- /* This populates the PkgList with all the possible permutations of the section/arch lists. */ -void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) +static void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) { // Load the defaults string DDir = Setup.Find("TreeDefault::Directory", @@ -550,7 +550,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) // LoadBinDir - Load a 'bindirectory' section from the Generate Config /*{{{*/ // --------------------------------------------------------------------- /* */ -void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup) +static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup) { mode_t const Permissions = Setup.FindI("Default::FileMode",0644); @@ -586,7 +586,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup) // ShowHelp - Show the help text /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &CmdL) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); @@ -639,7 +639,7 @@ bool ShowHelp(CommandLine &CmdL) // SimpleGenPackages - Generate a Packages file for a directory tree /*{{{*/ // --------------------------------------------------------------------- /* This emulates dpkg-scanpackages's command line interface. 'mostly' */ -bool SimpleGenPackages(CommandLine &CmdL) +static bool SimpleGenPackages(CommandLine &CmdL) { if (CmdL.FileSize() < 2) return ShowHelp(CmdL); @@ -667,7 +667,7 @@ bool SimpleGenPackages(CommandLine &CmdL) // SimpleGenContents - Generate a Contents listing /*{{{*/ // --------------------------------------------------------------------- /* */ -bool SimpleGenContents(CommandLine &CmdL) +static bool SimpleGenContents(CommandLine &CmdL) { if (CmdL.FileSize() < 2) return ShowHelp(CmdL); @@ -689,7 +689,7 @@ bool SimpleGenContents(CommandLine &CmdL) // SimpleGenSources - Generate a Sources file for a directory tree /*{{{*/ // --------------------------------------------------------------------- /* This emulates dpkg-scanpackages's command line interface. 'mostly' */ -bool SimpleGenSources(CommandLine &CmdL) +static bool SimpleGenSources(CommandLine &CmdL) { if (CmdL.FileSize() < 2) return ShowHelp(CmdL); @@ -722,7 +722,7 @@ bool SimpleGenSources(CommandLine &CmdL) /*}}}*/ // SimpleGenRelease - Generate a Release file for a directory tree /*{{{*/ // --------------------------------------------------------------------- -bool SimpleGenRelease(CommandLine &CmdL) +static bool SimpleGenRelease(CommandLine &CmdL) { if (CmdL.FileSize() < 2) return ShowHelp(CmdL); @@ -747,7 +747,7 @@ bool SimpleGenRelease(CommandLine &CmdL) // Generate - Full generate, using a config file /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Generate(CommandLine &CmdL) +static bool Generate(CommandLine &CmdL) { struct CacheDB::Stats SrcStats; if (CmdL.FileSize() < 2) @@ -911,7 +911,7 @@ bool Generate(CommandLine &CmdL) // Clean - Clean out the databases /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Clean(CommandLine &CmdL) +static bool Clean(CommandLine &CmdL) { if (CmdL.FileSize() != 2) return ShowHelp(CmdL); diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index 992f802a6..7ed984fa9 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -23,7 +23,7 @@ #include <dirent.h> #include <signal.h> -char const * const httpcodeToStr(int const httpcode) /*{{{*/ +static char const * const httpcodeToStr(int const httpcode) /*{{{*/ { switch (httpcode) { @@ -77,7 +77,7 @@ char const * const httpcodeToStr(int const httpcode) /*{{{*/ return NULL; } /*}}}*/ -void addFileHeaders(std::list<std::string> &headers, FileFd &data) /*{{{*/ +static void addFileHeaders(std::list<std::string> &headers, FileFd &data)/*{{{*/ { std::ostringstream contentlength; contentlength << "Content-Length: " << data.FileSize(); @@ -88,14 +88,14 @@ void addFileHeaders(std::list<std::string> &headers, FileFd &data) /*{{{*/ headers.push_back(lastmodified); } /*}}}*/ -void addDataHeaders(std::list<std::string> &headers, std::string &data) /*{{{*/ +static void addDataHeaders(std::list<std::string> &headers, std::string &data)/*{{{*/ { std::ostringstream contentlength; contentlength << "Content-Length: " << data.size(); headers.push_back(contentlength.str()); } /*}}}*/ -bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/ +static bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/ { std::string response("HTTP/1.1 "); response.append(httpcodeToStr(httpcode)); @@ -128,7 +128,7 @@ bool sendHead(int const client, int const httpcode, std::list<std::string> &head return Success; } /*}}}*/ -bool sendFile(int const client, FileFd &data) /*{{{*/ +static bool sendFile(int const client, FileFd &data) /*{{{*/ { bool Success = true; char buffer[500]; @@ -144,7 +144,7 @@ bool sendFile(int const client, FileFd &data) /*{{{*/ return Success; } /*}}}*/ -bool sendData(int const client, std::string const &data) /*{{{*/ +static bool sendData(int const client, std::string const &data) /*{{{*/ { if (FileFd::Write(client, data.c_str(), data.size()) == false) { @@ -154,7 +154,7 @@ bool sendData(int const client, std::string const &data) /*{{{*/ return true; } /*}}}*/ -void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/ +static void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/ bool content, std::string const &error = "") { std::list<std::string> headers; @@ -179,13 +179,13 @@ void sendError(int const client, int const httpcode, std::string const &request, if (content == true) sendData(client, response); } -void sendSuccess(int const client, std::string const &request, +static void sendSuccess(int const client, std::string const &request, bool content, std::string const &error = "") { sendError(client, 200, request, content, error); } /*}}}*/ -void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/ +static void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/ std::string const &request, bool content) { std::list<std::string> headers; @@ -222,7 +222,7 @@ void sendRedirect(int const client, int const httpcode, std::string const &uri,/ sendData(client, response); } /*}}}*/ -int filter_hidden_files(const struct dirent *a) /*{{{*/ +static int filter_hidden_files(const struct dirent *a) /*{{{*/ { if (a->d_name[0] == '.') return 0; @@ -236,7 +236,7 @@ int filter_hidden_files(const struct dirent *a) /*{{{*/ #endif return 1; } -int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) { +static int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) { #ifdef _DIRENT_HAVE_D_TYPE if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_DIR); else if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_REG) @@ -260,7 +260,7 @@ int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) { return strcasecmp((*a)->d_name, (*b)->d_name); } /*}}}*/ -void sendDirectoryListing(int const client, std::string const &dir, /*{{{*/ +static void sendDirectoryListing(int const client, std::string const &dir,/*{{{*/ std::string const &request, bool content) { std::list<std::string> headers; @@ -312,7 +312,7 @@ void sendDirectoryListing(int const client, std::string const &dir, /*{{{*/ sendData(client, response); } /*}}}*/ -bool parseFirstLine(int const client, std::string const &request, /*{{{*/ +static bool parseFirstLine(int const client, std::string const &request,/*{{{*/ std::string &filename, std::string ¶ms, bool &sendContent, bool &closeConnection) { @@ -432,7 +432,7 @@ bool parseFirstLine(int const client, std::string const &request, /*{{{*/ return true; } /*}}}*/ -bool handleOnTheFlyReconfiguration(int const client, std::string const &request, std::vector<std::string> const &parts)/*{{{*/ +static bool handleOnTheFlyReconfiguration(int const client, std::string const &request, std::vector<std::string> const &parts)/*{{{*/ { size_t const pcount = parts.size(); if (pcount == 4 && parts[1] == "set") @@ -475,7 +475,7 @@ bool handleOnTheFlyReconfiguration(int const client, std::string const &request, return false; } /*}}}*/ -void * handleClient(void * voidclient) /*{{{*/ +static void * handleClient(void * voidclient) /*{{{*/ { int client = *((int*)(voidclient)); std::clog << "ACCEPT client " << client << std::endl; diff --git a/test/interactive-helper/extract-control.cc b/test/interactive-helper/extract-control.cc index 3f7feabcb..94fe9dca8 100644 --- a/test/interactive-helper/extract-control.cc +++ b/test/interactive-helper/extract-control.cc @@ -7,7 +7,7 @@ using namespace std; -bool ExtractMember(const char *File,const char *Member) +static bool ExtractMember(const char *File,const char *Member) { FileFd Fd(File,FileFd::ReadOnly); debDebFile Deb(Fd); diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc index d28f20114..89375af13 100644 --- a/test/interactive-helper/testdeb.cc +++ b/test/interactive-helper/testdeb.cc @@ -9,7 +9,7 @@ class NullStream : public pkgDirStream virtual bool DoItem(Item &Itm,int &Fd) {return true;}; }; -bool Test(const char *File) +static bool Test(const char *File) { FileFd Fd(File,FileFd::ReadOnly); debDebFile Deb(Fd); diff --git a/test/libapt/assert.h b/test/libapt/assert.h index 113c057ed..cde6a6351 100644 --- a/test/libapt/assert.h +++ b/test/libapt/assert.h @@ -1,6 +1,11 @@ #include <iostream> #include <cstdlib> +#if __GNUC__ >= 4 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wmissing-declarations" +#endif + #define equals(x,y) assertEquals(y, x, __LINE__) #define equalsNot(x,y) assertEqualsNot(y, x, __LINE__) @@ -111,3 +116,7 @@ void dumpVector(X vec) { v != vec.end(); ++v) std::cout << *v << std::endl; } + +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc index fdb1d5674..44f8e9d78 100644 --- a/test/libapt/compareversion_test.cc +++ b/test/libapt/compareversion_test.cc @@ -31,7 +31,7 @@ using namespace std; -bool callDPkg(const char *val, const char *ref, const char &op) { +static bool callDPkg(const char *val, const char *ref, const char &op) { pid_t Process = ExecFork(); if (Process == 0) { @@ -50,7 +50,7 @@ bool callDPkg(const char *val, const char *ref, const char &op) { return WIFEXITED(Ret) == true && WEXITSTATUS(Ret) == 0; } -void assertVersion(int const &CurLine, string const &A, string const &B, int const &Expected) { +static void assertVersion(int const &CurLine, string const &A, string const &B, int const &Expected) { int Res = debVS.CmpVersion(A.c_str(), B.c_str()); bool const dpkg = callDPkg(A.c_str(),B.c_str(), Expected); Res = (Res < 0) ? -1 : ( (Res > 0) ? 1 : Res); @@ -61,7 +61,7 @@ void assertVersion(int const &CurLine, string const &A, string const &B, int con _error->Error("DPkg differ with line: %u. '%s' '%s' '%s' == false",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")),B.c_str()); } -bool RunTest(const char *File) +static bool RunTest(const char *File) { if (FileExists(File) == false) return _error->Error("Versiontestfile %s doesn't exist!", File); diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 0300ce929..e79b6d65e 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -9,7 +9,7 @@ char *tempfile = NULL; int tempfile_fd = -1; -void remove_tmpfile(void) +static void remove_tmpfile(void) { if (tempfile_fd > 0) close(tempfile_fd); diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc index d12c74c95..effc3244b 100644 --- a/test/libapt/tagfile_test.cc +++ b/test/libapt/tagfile_test.cc @@ -9,7 +9,7 @@ char *tempfile = NULL; int tempfile_fd = -1; -void remove_tmpfile(void) +static void remove_tmpfile(void) { if (tempfile_fd > 0) close(tempfile_fd); -- cgit v1.2.3 From ef74268b47fae1afd302a4a524b53143cbfd6ce1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 27 Feb 2014 03:32:13 +0100 Subject: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] Git-Dch: Ignore Reported-By: gcc -Wunsafe-loop-optimizations --- apt-pkg/contrib/strutl.cc | 2 +- apt-pkg/pkgcachegen.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 0d85b4fd3..61fcc6a7d 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1184,7 +1184,7 @@ unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin, R->Hit = false; unsigned long Hits = 0; - for (; ListBegin != ListEnd; ListBegin++) + for (; ListBegin < ListEnd; ++ListBegin) { // Check if the name is a regex const char *I; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 96b35f669..006f3952b 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1249,10 +1249,10 @@ static bool CheckValidity(const string &CacheFile, static unsigned long ComputeSize(FileIterator Start,FileIterator End) { unsigned long TotalSize = 0; - for (; Start != End; ++Start) + for (; Start < End; ++Start) { if ((*Start)->HasPackages() == false) - continue; + continue; TotalSize += (*Start)->Size(); } return TotalSize; -- cgit v1.2.3 From d64e130aa333837a8fda0f1bba51f2867ca520f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 1 Mar 2014 13:55:20 +0100 Subject: warning: type qualifiers ignored on function return type [-Wignored-qualifiers] Reported-By: gcc -Wignored-qualifiers Git-Dch: Ignore --- apt-pkg/aptconfiguration.cc | 4 ++-- apt-pkg/aptconfiguration.h | 4 ++-- apt-pkg/pkgcache.h | 4 ++-- apt-pkg/tagfile.cc | 2 +- apt-pkg/tagfile.h | 2 +- test/interactive-helper/aptwebserver.cc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 3948854c6..4c609c603 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -270,7 +270,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, } /*}}}*/ // checkLanguage - are we interested in the given Language? /*{{{*/ -bool const Configuration::checkLanguage(std::string Lang, bool const All) { +bool Configuration::checkLanguage(std::string Lang, bool const All) { // the empty Language is always interesting as it is the original if (Lang.empty() == true) return true; @@ -390,7 +390,7 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache } /*}}}*/ // checkArchitecture - are we interested in the given Architecture? /*{{{*/ -bool const Configuration::checkArchitecture(std::string const &Arch) { +bool Configuration::checkArchitecture(std::string const &Arch) { if (Arch == "all") return true; std::vector<std::string> const archs = getArchitectures(true); diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index 026493c6d..dfed194ae 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -73,7 +73,7 @@ public: /*{{{*/ * \param All defines if we check against all codes or only against used codes * \return true if we are interested, false otherwise */ - bool static const checkLanguage(std::string Lang, bool const All = false); + bool static checkLanguage(std::string Lang, bool const All = false); /** \brief Returns a vector of Architectures we support * @@ -89,7 +89,7 @@ public: /*{{{*/ * \param Arch we want to check * \return true if we are interested, false otherwise */ - bool static const checkArchitecture(std::string const &Arch); + bool static checkArchitecture(std::string const &Arch); /** \brief Representation of supported compressors */ struct Compressor { diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 9a88246a1..b3a714511 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -201,7 +201,7 @@ class pkgCache /*{{{*/ inline PkgFileIterator FileEnd(); inline bool MultiArchCache() const { return MultiArchEnabled; } - inline char const * const NativeArch() const; + inline char const * NativeArch(); // Make me a function pkgVersioningSystem *VS; @@ -661,7 +661,7 @@ struct pkgCache::StringItem /*}}}*/ -inline char const * const pkgCache::NativeArch() const +inline char const * pkgCache::NativeArch() { return StrP + HeaderP->Architecture; } #include <apt-pkg/cacheiterators.h> diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 832a40d1e..e1459c80e 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -471,7 +471,7 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags, return true; return FindFlag(Flags, Flag, Start, Stop); } -bool const pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag, +bool pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag, char const* Start, char const* Stop) { switch (StringToBool(string(Start, Stop))) diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 518d3dbcd..2f600d397 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -65,7 +65,7 @@ class pkgTagSection unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const; bool FindFlag(const char *Tag,unsigned long &Flags, unsigned long Flag) const; - bool static const FindFlag(unsigned long &Flags, unsigned long Flag, + bool static FindFlag(unsigned long &Flags, unsigned long Flag, const char* Start, const char* Stop); bool Scan(const char *Start,unsigned long MaxLength); inline unsigned long size() const {return Stop - Section;}; diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index 7ed984fa9..fb9f7d34e 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -23,7 +23,7 @@ #include <dirent.h> #include <signal.h> -static char const * const httpcodeToStr(int const httpcode) /*{{{*/ +static char const * httpcodeToStr(int const httpcode) /*{{{*/ { switch (httpcode) { -- cgit v1.2.3 From 655122418d714f342b5d9789f45f8035f3fe8b9a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 1 Mar 2014 15:11:42 +0100 Subject: =?UTF-8?q?warning:=20unused=20parameter=20=E2=80=98foo=E2=80=99?= =?UTF-8?q?=20[-Wunused-parameter]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-By: gcc -Wunused-parameter Git-Dch: Ignore --- apt-inst/deb/debfile.cc | 2 +- apt-inst/dirstream.cc | 2 +- apt-inst/dirstream.h | 4 ++-- apt-inst/extract.cc | 2 +- apt-pkg/acquire-item.cc | 20 ++++++++++---------- apt-pkg/cachefile.cc | 4 ++-- apt-pkg/cacheset.cc | 28 ++++++++++++++-------------- apt-pkg/cdrom.cc | 2 +- apt-pkg/deb/debindexfile.h | 2 +- apt-pkg/deb/dpkgpm.cc | 2 +- apt-pkg/deb/dpkgpm.h | 4 ++-- apt-pkg/depcache.cc | 10 +++++----- apt-pkg/depcache.h | 2 +- apt-pkg/edsp.cc | 10 ++++------ apt-pkg/edsp.h | 6 ++---- apt-pkg/edsp/edspindexfile.cc | 2 +- apt-pkg/edsp/edsplistparser.cc | 4 ++-- apt-pkg/edsp/edspsystem.cc | 6 +++--- apt-pkg/indexcopy.cc | 2 +- apt-pkg/indexfile.cc | 6 +++--- apt-pkg/indexfile.h | 4 ++-- apt-pkg/install-progress.cc | 4 ++-- apt-pkg/install-progress.h | 18 +++++++++--------- apt-pkg/packagemanager.h | 4 ++-- apt-pkg/pkgcache.cc | 2 +- apt-pkg/pkgcachegen.cc | 2 +- apt-pkg/pkgcachegen.h | 4 ++-- apt-pkg/pkgrecords.h | 2 +- apt-pkg/policy.cc | 2 +- apt-pkg/vendor.cc | 2 +- apt-private/acqprogress.cc | 2 +- apt-private/private-cacheset.h | 8 ++++---- apt-private/private-moo.cc | 8 ++++---- apt-private/private-output.cc | 6 +++--- cmdline/apt-cache.cc | 12 ++++++------ cmdline/apt-cdrom.cc | 2 +- cmdline/apt-config.cc | 2 +- cmdline/apt-extracttemplates.cc | 2 +- cmdline/apt-get.cc | 10 +++++----- cmdline/apt-helper.cc | 2 +- cmdline/apt-internal-solver.cc | 2 +- cmdline/apt-mark.cc | 2 +- cmdline/apt.cc | 2 +- ftparchive/apt-ftparchive.cc | 2 +- ftparchive/contents.cc | 2 +- ftparchive/override.cc | 2 +- ftparchive/writer.cc | 6 +++--- methods/ftp.cc | 2 +- methods/gzip.cc | 2 +- methods/https.cc | 8 ++++---- methods/https.h | 16 ++++++++-------- methods/mirror.cc | 2 +- methods/rsh.cc | 4 ++-- test/interactive-helper/testdeb.cc | 7 ++++++- test/libapt/cdromreducesourcelist_test.cc | 2 +- test/libapt/configuration_test.cc | 2 +- test/libapt/fileutl_test.cc | 2 +- test/libapt/getarchitectures_test.cc | 2 +- test/libapt/globalerror_test.cc | 2 +- test/libapt/hashsums_test.cc | 5 +++++ test/libapt/parsedepends_test.cc | 2 +- test/libapt/sourcelist_test.cc | 2 +- test/libapt/strutil_test.cc | 2 +- test/libapt/tagfile_test.cc | 2 +- 64 files changed, 153 insertions(+), 147 deletions(-) diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index a811bbe88..8684f03f7 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -194,7 +194,7 @@ bool debDebFile::MemControlExtract::DoItem(Item &Itm,int &Fd) // --------------------------------------------------------------------- /* Just memcopy the block from the tar extractor and put it in the right place in the pre-allocated memory block. */ -bool debDebFile::MemControlExtract::Process(Item &Itm,const unsigned char *Data, +bool debDebFile::MemControlExtract::Process(Item &/*Itm*/,const unsigned char *Data, unsigned long Size,unsigned long Pos) { memcpy(Control + Pos, Data,Size); diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index e06c30a57..085a0dcbf 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -110,7 +110,7 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd) // DirStream::Fail - Failed processing a file /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgDirStream::Fail(Item &Itm,int Fd) +bool pkgDirStream::Fail(Item &/*Itm*/, int Fd) { if (Fd < 0) return true; diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h index 9d1af2188..1be2688a1 100644 --- a/apt-inst/dirstream.h +++ b/apt-inst/dirstream.h @@ -49,8 +49,8 @@ class pkgDirStream virtual bool DoItem(Item &Itm,int &Fd); virtual bool Fail(Item &Itm,int Fd); virtual bool FinishedFile(Item &Itm,int Fd); - virtual bool Process(Item &Itm,const unsigned char *Data, - unsigned long Size,unsigned long Pos) {return true;}; + virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/, + unsigned long /*Size*/,unsigned long /*Pos*/) {return true;}; virtual ~pkgDirStream() {}; }; diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index b3dfccfc6..60edc702e 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -79,7 +79,7 @@ pkgExtract::pkgExtract(pkgFLCache &FLCache,pkgCache::VerIterator Ver) : // Extract::DoItem - Handle a single item from the stream /*{{{*/ // --------------------------------------------------------------------- /* This performs the setup for the extraction.. */ -bool pkgExtract::DoItem(Item &Itm,int &Fd) +bool pkgExtract::DoItem(Item &Itm, int &/*Fd*/) { /* Strip any leading/trailing /s from the filename, then copy it to the temp buffer and re-apply the leading / We use a class variable diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 88b10d4b1..3b22743e7 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -108,8 +108,8 @@ void pkgAcquire::Item::Start(string /*Message*/,unsigned long long Size) // Acquire::Item::Done - Item downloaded OK /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcquire::Item::Done(string Message,unsigned long long Size,string Hash, - pkgAcquire::MethodConfig *Cnf) +void pkgAcquire::Item::Done(string Message,unsigned long long Size,string /*Hash*/, + pkgAcquire::MethodConfig * /*Cnf*/) { // We just downloaded something.. string FileName = LookupTag(Message,"Filename"); @@ -253,10 +253,10 @@ string pkgAcqSubIndex::Custom600Headers() return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ -void pkgAcqSubIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ +void pkgAcqSubIndex::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/*{{{*/ { if(Debug) - std::clog << "pkgAcqSubIndex failed: " << Desc.URI << std::endl; + std::clog << "pkgAcqSubIndex failed: " << Desc.URI << " with " << Message << std::endl; Complete = false; Status = StatDone; @@ -544,10 +544,10 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ return false; } /*}}}*/ -void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ +void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/*{{{*/ { if(Debug) - std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl + std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << " with " << Message << std::endl << "Falling back to normal index file acquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc, @@ -624,10 +624,10 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, } } /*}}}*/ -void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ +void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/*{{{*/ { if(Debug) - std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl + std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << " with " << Message << std::endl << "Falling back to normal index file acquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, ExpectedHash); @@ -808,7 +808,7 @@ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner, QueueURI(Desc); } /*}}}*/ -void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/ +void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/*{{{*/ { if(Debug) std::clog << "pkgAcqIndexMergeDiffs failed: " << Desc.URI << " with " << Message << std::endl; @@ -1698,7 +1698,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ // pkgAcqMetaIndex::Failed - no Release file present or no signature file present /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/) { if (AuthPass == true) { diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 7c2276185..2401b015e 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -99,7 +99,7 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) // CacheFile::BuildSourceList - Open and build all relevant sources.list/*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheFile::BuildSourceList(OpProgress *Progress) +bool pkgCacheFile::BuildSourceList(OpProgress * /*Progress*/) { if (SrcList != NULL) return true; @@ -113,7 +113,7 @@ bool pkgCacheFile::BuildSourceList(OpProgress *Progress) // CacheFile::BuildPolicy - Open and build all relevant preferences /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheFile::BuildPolicy(OpProgress *Progress) +bool pkgCacheFile::BuildPolicy(OpProgress * /*Progress*/) { if (Policy != NULL) return true; diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 6b6fdb5ad..8a30d00a2 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -588,13 +588,13 @@ pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, } /*}}}*/ // canNotFindTask - handle the case no package is found for a task /*{{{*/ -void CacheSetHelper::canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) { +void CacheSetHelper::canNotFindTask(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string pattern) { if (ShowError == true) _error->Insert(ErrorType, _("Couldn't find task '%s'"), pattern.c_str()); } /*}}}*/ // canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ -void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) { +void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string pattern) { if (ShowError == true) _error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str()); } @@ -606,25 +606,25 @@ void CacheSetHelper::canNotFindFnmatch(PackageContainerInterface * const pci, pk } #endif /*}}}*/ // canNotFindPackage - handle the case no package is found from a string/*{{{*/ -void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str) { +void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string const &/*str*/) { } /*}}}*/ // canNotFindAllVer /*{{{*/ -void CacheSetHelper::canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, +void CacheSetHelper::canNotFindAllVer(VersionContainerInterface * const /*vci*/, pkgCacheFile &/*Cache*/, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Insert(ErrorType, _("Can't select versions from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); } /*}}}*/ // canNotFindInstCandVer /*{{{*/ -void CacheSetHelper::canNotFindInstCandVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, +void CacheSetHelper::canNotFindInstCandVer(VersionContainerInterface * const /*vci*/, pkgCacheFile &/*Cache*/, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); } /*}}}*/ // canNotFindInstCandVer /*{{{*/ -void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, +void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const /*vci*/, pkgCacheFile &/*Cache*/, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); @@ -655,13 +655,13 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache } /*}}}*/ // showTaskSelection /*{{{*/ -void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &pkg, - std::string const &pattern) { +void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &/*pkg*/, + std::string const &/*pattern*/) { } /*}}}*/ // showRegExSelection /*{{{*/ -void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &pkg, - std::string const &pattern) { +void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &/*pkg*/, + std::string const &/*pattern*/) { } /*}}}*/ #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) @@ -672,10 +672,10 @@ void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &pkg, /*}}}*/ #endif // showSelectedVersion /*{{{*/ -void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &Pkg, - pkgCache::VerIterator const Ver, - std::string const &ver, - bool const verIsRel) { +void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/, + pkgCache::VerIterator const /*Ver*/, + std::string const &/*ver*/, + bool const /*verIsRel*/) { } /*}}}*/ } diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index ea5ed7e92..6f946b030 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -369,7 +369,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) // --------------------------------------------------------------------- /* This takes the list of source list expressed entires and collects similar ones to form a single entry for each dist */ -void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List) +void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List) { sort(List.begin(),List.end()); diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 9e64d4476..e079d40c2 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -33,7 +33,7 @@ class debStatusIndex : public pkgIndexFile virtual const Type *GetType() const; // Interface for acquire - virtual std::string Describe(bool Short) const {return File;}; + virtual std::string Describe(bool /*Short*/) const {return File;}; // Interface for the Cache Generator virtual bool Exists() const; diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 91893c4e1..adf59516e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1581,7 +1581,7 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) return true; } -void SigINT(int sig) { +void SigINT(int /*sig*/) { pkgPackageManager::SigINTStop = true; } /*}}}*/ diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 02e12a6d9..c144f78e1 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -109,10 +109,10 @@ class pkgDPkgPM : public pkgPackageManager void DoDpkgStatusFd(int statusfd); void ProcessDpkgStatusLine(char *line); #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) - void DoDpkgStatusFd(int statusfd, int unused) { + void DoDpkgStatusFd(int statusfd, int /*unused*/) { DoDpkgStatusFd(statusfd); } - void ProcessDpkgStatusLine(int unused, char *line) { + void ProcessDpkgStatusLine(int /*unused*/, char *line) { ProcessDpkgStatusLine(line); } #endif diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 946c1e254..b45f5d9b5 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -222,7 +222,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ return true; } /*}}}*/ -bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ +bool pkgDepCache::writeStateFile(OpProgress * /*prog*/, bool InstalledOnly) /*{{{*/ { bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); @@ -868,7 +868,7 @@ bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge, return IsDeleteOkProtectInstallRequests(Pkg, rPurge, Depth, FromUser); } bool pkgDepCache::IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg, - bool const rPurge, unsigned long const Depth, bool const FromUser) + bool const /*rPurge*/, unsigned long const Depth, bool const FromUser) { if (FromUser == false && Pkg->CurrentVer == 0) { @@ -1297,7 +1297,7 @@ bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst, return IsInstallOkMultiArchSameVersionSynced(Pkg,AutoInst, Depth, FromUser); } bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, - bool const AutoInst, unsigned long const Depth, bool const FromUser) + bool const /*AutoInst*/, unsigned long const Depth, bool const FromUser) { if (FromUser == true) // as always: user is always right return true; @@ -1685,9 +1685,9 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) } /*}}}*/ // Policy::GetPriority - Get the priority of the package pin /*{{{*/ -signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &Pkg) +signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &/*Pkg*/) { return 0; } -signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &File) +signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &/*File*/) { return 0; } /*}}}*/ pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() /*{{{*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index a02a86b87..50f810806 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -61,7 +61,7 @@ class pkgDepCache : protected pkgCache::Namespace class InRootSetFunc { public: - virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;}; + virtual bool InRootSet(const pkgCache::PkgIterator &/*pkg*/) {return false;}; virtual ~InRootSetFunc() {}; }; diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index e90598392..dbd2dba46 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -44,7 +44,7 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress) for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p) { WriteScenarioVersion(Cache, output, Pkg, Ver); - WriteScenarioDependency(Cache, output, Pkg, Ver); + WriteScenarioDependency(output, Ver); fprintf(output, "\n"); if (Progress != NULL && p % 100 == 0) Progress->Progress(p); @@ -64,7 +64,7 @@ bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output, for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) { WriteScenarioVersion(Cache, output, Pkg, Ver); - WriteScenarioLimitedDependency(Cache, output, Pkg, Ver, pkgset); + WriteScenarioLimitedDependency(output, Ver, pkgset); fprintf(output, "\n"); if (Progress != NULL && p % 100 == 0) Progress->Progress(p); @@ -111,8 +111,7 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI } /*}}}*/ // EDSP::WriteScenarioDependency /*{{{*/ -void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg, - pkgCache::VerIterator const &Ver) +void EDSP::WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver) { std::string dependencies[pkgCache::Dep::Enhances + 1]; bool orGroup = false; @@ -148,8 +147,7 @@ void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::P } /*}}}*/ // EDSP::WriteScenarioLimitedDependency /*{{{*/ -void EDSP::WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output, - pkgCache::PkgIterator const &Pkg, +void EDSP::WriteScenarioLimitedDependency(FILE* output, pkgCache::VerIterator const &Ver, APT::PackageSet const &pkgset) { diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index fd4436f60..828ee3753 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -35,11 +35,9 @@ class EDSP /*{{{*/ void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver); - void static WriteScenarioDependency(pkgDepCache &Cache, FILE* output, - pkgCache::PkgIterator const &Pkg, + void static WriteScenarioDependency(FILE* output, pkgCache::VerIterator const &Ver); - void static WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output, - pkgCache::PkgIterator const &Pkg, + void static WriteScenarioLimitedDependency(FILE* output, pkgCache::VerIterator const &Ver, APT::PackageSet const &pkgset); public: diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index 98ce4497a..80b9f79ea 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -63,7 +63,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const class edspIFType: public pkgIndexFile::Type { public: - virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const + virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator) const { // we don't have a record parser for this type as the file is not presistent return NULL; diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc index bcfdb1017..37959f37b 100644 --- a/apt-pkg/edsp/edsplistparser.cc +++ b/apt-pkg/edsp/edsplistparser.cc @@ -84,8 +84,8 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg, } /*}}}*/ // ListParser::LoadReleaseInfo - Load the release information /*{{{*/ -bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, - FileFd &File, std::string component) +bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator & /*FileI*/, + FileFd & /*File*/, std::string /*component*/) { return true; } diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc index aae969d9d..b509fa001 100644 --- a/apt-pkg/edsp/edspsystem.cc +++ b/apt-pkg/edsp/edspsystem.cc @@ -49,7 +49,7 @@ bool edspSystem::Lock() } /*}}}*/ // System::UnLock - Drop a lock /*{{{*/ -bool edspSystem::UnLock(bool NoErrors) +bool edspSystem::UnLock(bool /*NoErrors*/) { return true; } @@ -58,7 +58,7 @@ bool edspSystem::UnLock(bool NoErrors) // --------------------------------------------------------------------- /* we can't use edsp input as input for real installations - just a simulation can work, but everything else will fail bigtime */ -pkgPackageManager *edspSystem::CreatePM(pkgDepCache *Cache) const +pkgPackageManager *edspSystem::CreatePM(pkgDepCache * /*Cache*/) const { return NULL; } @@ -81,7 +81,7 @@ bool edspSystem::Initialize(Configuration &Cnf) } /*}}}*/ // System::ArchiveSupported - Is a file format supported /*{{{*/ -bool edspSystem::ArchiveSupported(const char *Type) +bool edspSystem::ArchiveSupported(const char * /*Type*/) { return false; } diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 38356df18..59afa86ec 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -551,7 +551,7 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName, /*{{{*/ } /*}}}*/ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, /*{{{*/ - vector<string> PkgList,vector<string> SrcList) + vector<string> /*PkgList*/,vector<string> /*SrcList*/) { if (SigList.empty() == true) return true; diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 642a750d4..875c80336 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -47,7 +47,7 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type) // IndexFile::ArchiveInfo - Stub /*{{{*/ // --------------------------------------------------------------------- /* */ -std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator Ver) const +std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator /*Ver*/) const { return std::string(); } @@ -63,8 +63,8 @@ pkgCache::PkgFileIterator pkgIndexFile::FindInCache(pkgCache &Cache) const // IndexFile::SourceIndex - Stub /*{{{*/ // --------------------------------------------------------------------- /* */ -std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record, - pkgSrcRecords::File const &File) const +std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &/*Record*/, + pkgSrcRecords::File const &/*File*/) const { return std::string(); } diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index a0096fa34..9a5c74200 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -78,10 +78,10 @@ class pkgIndexFile virtual bool Exists() const = 0; virtual bool HasPackages() const = 0; virtual unsigned long Size() const = 0; - virtual bool Merge(pkgCacheGenerator &Gen, OpProgress* Prog) const { return false; }; + virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* /*Prog*/) const { return false; }; __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const { return Merge(Gen, &Prog); }; - virtual bool MergeFileProvides(pkgCacheGenerator &Gen,OpProgress* Prog) const {return true;}; + virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;}; __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const {return MergeFileProvides(Gen, &Prog);}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index aec744360..657330b60 100644 --- a/apt-pkg/install-progress.cc +++ b/apt-pkg/install-progress.cc @@ -41,10 +41,10 @@ PackageManager* PackageManagerProgressFactory() return progress; } -bool PackageManager::StatusChanged(std::string PackageName, +bool PackageManager::StatusChanged(std::string /*PackageName*/, unsigned int StepsDone, unsigned int TotalSteps, - std::string HumanReadableAction) + std::string /*HumanReadableAction*/) { int reporting_steps = _config->FindI("DpkgPM::Reporting-Steps", 1); percentage = StepsDone/(float)TotalSteps * 100.0; diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h index 8bcc32927..baf245376 100644 --- a/apt-pkg/install-progress.h +++ b/apt-pkg/install-progress.h @@ -29,7 +29,7 @@ namespace Progress { virtual ~PackageManager() {}; /* Global Start/Stop */ - virtual void Start(int child_pty=-1) {}; + virtual void Start(int /*child_pty*/=-1) {}; virtual void Stop() {}; /* When dpkg is invoked (may happen multiple times for each @@ -48,14 +48,14 @@ namespace Progress { unsigned int StepsDone, unsigned int TotalSteps, std::string HumanReadableAction); - virtual void Error(std::string PackageName, - unsigned int StepsDone, - unsigned int TotalSteps, - std::string ErrorMessage) {} - virtual void ConffilePrompt(std::string PackageName, - unsigned int StepsDone, - unsigned int TotalSteps, - std::string ConfMessage) {} + virtual void Error(std::string /*PackageName*/, + unsigned int /*StepsDone*/, + unsigned int /*TotalSteps*/, + std::string /*ErrorMessage*/) {} + virtual void ConffilePrompt(std::string /*PackageName*/, + unsigned int /*StepsDone*/, + unsigned int /*TotalSteps*/, + std::string /*ConfMessage*/) {} }; class PackageManagerProgressFd : public PackageManager diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 853b9bac8..d684463eb 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -89,9 +89,9 @@ class pkgPackageManager : protected pkgCache::Namespace virtual bool Configure(PkgIterator /*Pkg*/) {return false;}; virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;}; #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) - virtual bool Go(APT::Progress::PackageManager *progress) {return true;}; + virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;}; #else - virtual bool Go(int statusFd=-1) {return true;}; + virtual bool Go(int /*statusFd*/=-1) {return true;}; #endif virtual void Reset() {}; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 7d57640c5..9c14e626e 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -695,7 +695,7 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End) // --------------------------------------------------------------------- /* Deps like self-conflicts should be ignored as well as implicit conflicts on virtual packages. */ -bool pkgCache::DepIterator::IsIgnorable(PkgIterator const &Pkg) const +bool pkgCache::DepIterator::IsIgnorable(PkgIterator const &/*Pkg*/) const { if (IsNegative() == false) return false; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 006f3952b..185b9ca45 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1580,7 +1580,7 @@ static bool IsDuplicateDescription(pkgCache::DescIterator Desc, } /*}}}*/ // CacheGenerator::FinishCache /*{{{*/ -bool pkgCacheGenerator::FinishCache(OpProgress *Progress) +bool pkgCacheGenerator::FinishCache(OpProgress * /*Progress*/) { return true; } diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 428e8459b..e8901025e 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -170,8 +170,8 @@ class pkgCacheGenerator::ListParser virtual bool Step() = 0; inline bool HasFileDeps() {return FoundFileDeps;}; - virtual bool CollectFileProvides(pkgCache &Cache, - pkgCache::VerIterator &Ver) {return true;}; + virtual bool CollectFileProvides(pkgCache &/*Cache*/, + pkgCache::VerIterator &/*Ver*/) {return true;}; ListParser() : FoundFileDeps(false) {}; virtual ~ListParser() {}; diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 3658435e8..ca0984bbf 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -70,7 +70,7 @@ class pkgRecords::Parser /*{{{*/ virtual std::string Homepage() {return std::string();} // An arbitrary custom field - virtual std::string RecordField(const char *fieldName) { return std::string();}; + virtual std::string RecordField(const char * /*fieldName*/) { return std::string();}; // The record in binary form virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;}; diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index d0f97441d..2176f1f42 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -349,7 +349,7 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File) all over the place rather than forcing a special format */ class PreferenceSection : public pkgTagSection { - void TrimRecord(bool BeforeRecord, const char* &End) + void TrimRecord(bool /*BeforeRecord*/, const char* &End) { for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r' || Stop[0] == '#'); Stop++) if (Stop[0] == '#') diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc index fc03ec845..f19534171 100644 --- a/apt-pkg/vendor.cc +++ b/apt-pkg/vendor.cc @@ -31,7 +31,7 @@ const std::string Vendor::LookupFingerprint(std::string Print) const return (*Elt).second; } -bool Vendor::CheckDist(std::string Dist) +bool Vendor::CheckDist(std::string /*Dist*/) { return true; } diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index 66e1600f1..d08ed072f 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -93,7 +93,7 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm) // AcqTextStatus::Done - Completed a download /*{{{*/ // --------------------------------------------------------------------- /* We don't display anything... */ -void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm) +void AcqTextStatus::Done(pkgAcquire::ItemDesc &/*Itm*/) { Update = true; } diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h index 322b3be6b..26c7f1ac2 100644 --- a/apt-private/private-cacheset.h +++ b/apt-private/private-cacheset.h @@ -42,8 +42,8 @@ typedef APT::VersionContainer< class Matcher { public: - virtual bool operator () (const pkgCache::PkgIterator &P) { - return true;}; + virtual bool operator () (const pkgCache::PkgIterator &/*P*/) { + return true;} }; // FIXME: add default argument for OpProgress (or overloaded function) @@ -111,8 +111,8 @@ public: Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } - virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, - std::string const &ver, bool const verIsRel) { + virtual void showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/, pkgCache::VerIterator const Ver, + std::string const &ver, bool const /*verIsRel*/) { if (ver == Ver.VerStr()) return; selectedByRelease.push_back(make_pair(Ver, ver)); diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc index 5d247041d..9c4f6bf15 100644 --- a/apt-private/private-moo.cc +++ b/apt-private/private-moo.cc @@ -65,7 +65,7 @@ static bool printMooLine() { /*{{{*/ return true; } /*}}}*/ -bool DoMoo1(CommandLine &CmdL) /*{{{*/ +bool DoMoo1(CommandLine &) /*{{{*/ { // our trustworthy super cow since 2001 if (_config->FindI("quiet") >= 2) @@ -83,7 +83,7 @@ bool DoMoo1(CommandLine &CmdL) /*{{{*/ return true; } /*}}}*/ -bool DoMoo2(CommandLine &CmdL) /*{{{*/ +bool DoMoo2(CommandLine &) /*{{{*/ { // by Fernando Ribeiro in lp:56125 if (_config->FindI("quiet") >= 2) @@ -117,7 +117,7 @@ bool DoMoo2(CommandLine &CmdL) /*{{{*/ return true; } /*}}}*/ -bool DoMoo3(CommandLine &CmdL) /*{{{*/ +bool DoMoo3(CommandLine &) /*{{{*/ { // by Robert Millan in deb:134156 if (_config->FindI("quiet") >= 2) @@ -134,7 +134,7 @@ bool DoMoo3(CommandLine &CmdL) /*{{{*/ return true; } /*}}}*/ -bool DoMooApril(CommandLine &CmdL) /*{{{*/ +bool DoMooApril(CommandLine &) /*{{{*/ { // by Christopher Allan Webber and proposed by Paul Tagliamonte // in a "Community outreach": https://lists.debian.org/debian-devel/2013/04/msg00045.html diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index dec518392..52f65d794 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -63,7 +63,7 @@ bool InitOutput() /*{{{*/ return true; } /*}}}*/ -static std::string GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver) /*{{{*/ +static std::string GetArchiveSuite(pkgCacheFile &/*CacheFile*/, pkgCache::VerIterator ver) /*{{{*/ { std::string suite = ""; if (ver && ver.FileList() && ver.FileList()) @@ -107,14 +107,14 @@ static std::string GetCandidateVersion(pkgCacheFile &CacheFile, pkgCache::PkgIte return cand ? cand.VerStr() : "(none)"; } /*}}}*/ -static std::string GetInstalledVersion(pkgCacheFile &CacheFile, pkgCache::PkgIterator P)/*{{{*/ +static std::string GetInstalledVersion(pkgCacheFile &/*CacheFile*/, pkgCache::PkgIterator P)/*{{{*/ { pkgCache::VerIterator inst = P.CurrentVer(); return inst ? inst.VerStr() : "(none)"; } /*}}}*/ -static std::string GetVersion(pkgCacheFile &CacheFile, pkgCache::VerIterator V)/*{{{*/ +static std::string GetVersion(pkgCacheFile &/*CacheFile*/, pkgCache::VerIterator V)/*{{{*/ { pkgCache::PkgIterator P = V.ParentPkg(); if (V == P.CurrentVer()) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 7e569f2fc..d50e0c724 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -258,7 +258,7 @@ static bool DumpPackage(CommandLine &CmdL) // Stats - Dump some nice statistics /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool Stats(CommandLine &Cmd) +static bool Stats(CommandLine &) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -371,7 +371,7 @@ static bool Stats(CommandLine &Cmd) // Dump - show everything /*{{{*/ // --------------------------------------------------------------------- /* This is worthless except fer debugging things */ -static bool Dump(CommandLine &Cmd) +static bool Dump(CommandLine &) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -423,7 +423,7 @@ static bool Dump(CommandLine &Cmd) // --------------------------------------------------------------------- /* This is needed to make dpkg --merge happy.. I spent a bit of time to make this run really fast, perhaps I went a little overboard.. */ -static bool DumpAvail(CommandLine &Cmd) +static bool DumpAvail(CommandLine &) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -1388,7 +1388,7 @@ static bool Search(CommandLine &CmdL) } /*}}}*/ /* ShowAuto - show automatically installed packages (sorted) {{{*/ -static bool ShowAuto(CommandLine &CmdL) +static bool ShowAuto(CommandLine &) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); @@ -1717,7 +1717,7 @@ static bool Madison(CommandLine &CmdL) // GenCaches - Call the main cache generator /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool GenCaches(CommandLine &Cmd) +static bool GenCaches(CommandLine &) { OpTextProgress Progress(*_config); @@ -1728,7 +1728,7 @@ static bool GenCaches(CommandLine &Cmd) // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool ShowHelp(CommandLine &Cmd) +static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index dc0e050c3..8e1d27e52 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -93,7 +93,7 @@ bool pkgCdromTextStatus::AskCdromName(string &name) } -void pkgCdromTextStatus::Update(string text, int current) +void pkgCdromTextStatus::Update(string text, int /*current*/) { if(text.size() > 0) cout << text << flush; diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index e83c4b64b..26f0ea161 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -78,7 +78,7 @@ static bool DoDump(CommandLine &CmdL) // ShowHelp - Show the help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 2b01968e3..a27008233 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -137,7 +137,7 @@ bool DebFile::DoItem(Item &I, int &Fd) // DebFile::Process examine element in package and copy /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DebFile::Process(Item &I, const unsigned char *data, +bool DebFile::Process(Item &/*I*/, const unsigned char *data, unsigned long size, unsigned long pos) { switch (Which) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 253b2f4a5..9a4eb0881 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -475,7 +475,7 @@ static bool DoMarkAuto(CommandLine &CmdL) // DoDSelectUpgrade - Do an upgrade by following dselects selections /*{{{*/ // --------------------------------------------------------------------- /* Follows dselect's selections */ -static bool DoDSelectUpgrade(CommandLine &CmdL) +static bool DoDSelectUpgrade(CommandLine &) { CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) @@ -551,7 +551,7 @@ static bool DoDSelectUpgrade(CommandLine &CmdL) // DoClean - Remove download archives /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool DoClean(CommandLine &CmdL) +static bool DoClean(CommandLine &) { std::string const archivedir = _config->FindDir("Dir::Cache::archives"); std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache"); @@ -599,7 +599,7 @@ class LogCleaner : public pkgArchiveCleaner }; }; -static bool DoAutoClean(CommandLine &CmdL) +static bool DoAutoClean(CommandLine &) { // Lock the archive directory FileFd Lock; @@ -696,7 +696,7 @@ static bool DoDownload(CommandLine &CmdL) // --------------------------------------------------------------------- /* Opening automatically checks the system, this command is mostly used for debugging */ -static bool DoCheck(CommandLine &CmdL) +static bool DoCheck(CommandLine &) { CacheFile Cache; Cache.Open(); @@ -1581,7 +1581,7 @@ static bool DoChangelog(CommandLine &CmdL) // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index d8ea0435a..8ff2fa037 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -55,7 +55,7 @@ static bool DoDownloadFile(CommandLine &CmdL) return true; } -static bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index 108e86b9a..0c2ff0f43 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -30,7 +30,7 @@ // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool ShowHelp(CommandLine &CmdL) { +static bool ShowHelp(CommandLine &) { ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 1af17cd7a..53b5ec158 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -372,7 +372,7 @@ static bool ShowHold(CommandLine &CmdL) // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 040ed6c25..1b7626948 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -61,7 +61,7 @@ -static bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &) { ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index c28ad5c5c..f13e4648a 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -586,7 +586,7 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup) // ShowHelp - Show the help text /*{{{*/ // --------------------------------------------------------------------- /* */ -static bool ShowHelp(CommandLine &CmdL) +static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 80fe6e17e..be4d2a61e 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -316,7 +316,7 @@ bool ContentsExtract::Read(debDebFile &Deb) // ContentsExtract::DoItem - Extract an item /*{{{*/ // --------------------------------------------------------------------- /* This just tacks the name onto the end of our memory buffer */ -bool ContentsExtract::DoItem(Item &Itm,int &Fd) +bool ContentsExtract::DoItem(Item &Itm, int &/*Fd*/) { unsigned long Len = strlen(Itm.Name); diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 82cbc4c19..38d76a6a3 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -129,7 +129,7 @@ bool Override::ReadOverride(string const &File,bool const &Source) // Override::ReadExtraOverride - Read the extra override file /*{{{*/ // --------------------------------------------------------------------- /* This parses the extra override file and reads it into the map */ -bool Override::ReadExtraOverride(string const &File,bool const &Source) +bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/) { if (File.empty() == true) return true; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 7ecfe78ed..edc0fddea 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -72,9 +72,9 @@ FTWScanner::FTWScanner(string const &Arch): Arch(Arch) /*}}}*/ // FTWScanner::Scanner - FTW Scanner /*{{{*/ // --------------------------------------------------------------------- -/* This is the FTW scanner, it processes each directory element in the +/* This is the FTW scanner, it processes each directory element in the directory tree. */ -int FTWScanner::ScannerFTW(const char *File,const struct stat *sb,int Flag) +int FTWScanner::ScannerFTW(const char *File,const struct stat * /*sb*/,int Flag) { if (Flag == FTW_DNR) { @@ -951,7 +951,7 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres // ReleaseWriter::ReleaseWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -ReleaseWriter::ReleaseWriter(string const &DB) +ReleaseWriter::ReleaseWriter(string const &/*DB*/) { if (_config->FindB("APT::FTPArchive::Release::Default-Patterns", true) == true) { diff --git a/methods/ftp.cc b/methods/ftp.cc index 5a87ded1c..4108b2da3 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1098,7 +1098,7 @@ bool FtpMethod::Fetch(FetchItem *Itm) } /*}}}*/ -int main(int argc,const char *argv[]) +int main(int, const char *argv[]) { setlocale(LC_ALL, ""); diff --git a/methods/gzip.cc b/methods/gzip.cc index a2844e969..3269ffbb8 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -120,7 +120,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) } /*}}}*/ -int main(int argc, char *argv[]) +int main(int, char *argv[]) { setlocale(LC_ALL, ""); diff --git a/methods/https.cc b/methods/https.cc index b0c7ee71d..041214179 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -83,9 +83,9 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp) return size*nmemb; } -int -HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, - double ultotal, double ulnow) +int +HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/, + double /*ultotal*/, double /*ulnow*/) { HttpsMethod *me = (HttpsMethod *)clientp; if(dltotal > 0 && me->Res.Size == 0) { @@ -95,7 +95,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, } // HttpsServerState::HttpsServerState - Constructor /*{{{*/ -HttpsServerState::HttpsServerState(URI Srv,HttpsMethod *Owner) : ServerState(Srv, NULL) +HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL) { TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut); Reset(); diff --git a/methods/https.h b/methods/https.h index ab0dd3407..3199b29f2 100644 --- a/methods/https.h +++ b/methods/https.h @@ -25,23 +25,23 @@ class FileFd; class HttpsServerState : public ServerState { protected: - virtual bool ReadHeaderLines(std::string &Data) { return false; } - virtual bool LoadNextResponse(bool const ToFile, FileFd * const File) { return false; } + virtual bool ReadHeaderLines(std::string &/*Data*/) { return false; } + virtual bool LoadNextResponse(bool const /*ToFile*/, FileFd * const /*File*/) { return false; } public: - virtual bool WriteResponse(std::string const &Data) { return false; } + virtual bool WriteResponse(std::string const &/*Data*/) { return false; } /** \brief Transfer the data from the socket */ - virtual bool RunData(FileFd * const File) { return false; } + virtual bool RunData(FileFd * const /*File*/) { return false; } virtual bool Open() { return false; } virtual bool IsOpen() { return false; } virtual bool Close() { return false; } - virtual bool InitHashes(FileFd &File) { return false; } + virtual bool InitHashes(FileFd &/*File*/) { return false; } virtual Hashes * GetHashes() { return NULL; } - virtual bool Die(FileFd &File) { return false; } - virtual bool Flush(FileFd * const File) { return false; } - virtual bool Go(bool ToFile, FileFd * const File) { return false; } + virtual bool Die(FileFd &/*File*/) { return false; } + virtual bool Flush(FileFd * const /*File*/) { return false; } + virtual bool Go(bool /*ToFile*/, FileFd * const /*File*/) { return false; } HttpsServerState(URI Srv, HttpsMethod *Owner); virtual ~HttpsServerState() {Close();}; diff --git a/methods/mirror.cc b/methods/mirror.cc index 977eddcf5..b30636758 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -132,7 +132,7 @@ bool MirrorMethod::Clean(string Dir) } -bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) +bool MirrorMethod::DownloadMirrorFile(string /*mirror_uri_str*/) { // not that great to use pkgAcquire here, but we do not have // any other way right now diff --git a/methods/rsh.cc b/methods/rsh.cc index f065f6b89..8088cac38 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -390,7 +390,7 @@ bool RSHMethod::Configuration(std::string Message) // RSHMethod::SigTerm - Clean up and timestamp the files on exit /*{{{*/ // --------------------------------------------------------------------- /* */ -void RSHMethod::SigTerm(int sig) +void RSHMethod::SigTerm(int) { if (FailFd == -1) _exit(100); @@ -519,7 +519,7 @@ bool RSHMethod::Fetch(FetchItem *Itm) } /*}}}*/ -int main(int argc, const char *argv[]) +int main(int, const char *argv[]) { setlocale(LC_ALL, ""); diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc index 89375af13..9520d1b50 100644 --- a/test/interactive-helper/testdeb.cc +++ b/test/interactive-helper/testdeb.cc @@ -6,7 +6,7 @@ class NullStream : public pkgDirStream { public: - virtual bool DoItem(Item &Itm,int &Fd) {return true;}; + virtual bool DoItem(Item &/*Itm*/, int &/*Fd*/) {return true;}; }; static bool Test(const char *File) @@ -33,6 +33,11 @@ static bool Test(const char *File) int main(int argc, const char *argv[]) { + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + Test(argv[1]); _error->DumpErrors(); return 0; diff --git a/test/libapt/cdromreducesourcelist_test.cc b/test/libapt/cdromreducesourcelist_test.cc index 729da23a6..b0314769d 100644 --- a/test/libapt/cdromreducesourcelist_test.cc +++ b/test/libapt/cdromreducesourcelist_test.cc @@ -15,7 +15,7 @@ public: } }; -int main(int argc, char const *argv[]) { +int main() { Cdrom cd; std::vector<std::string> List; std::string CD("/media/cdrom/"); diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc index 957e905d5..d2efc1b4b 100644 --- a/test/libapt/configuration_test.cc +++ b/test/libapt/configuration_test.cc @@ -5,7 +5,7 @@ #include "assert.h" -int main(int argc,const char *argv[]) { +int main() { Configuration Cnf; std::vector<std::string> fds; diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc index 462bdefd9..d256ea55a 100644 --- a/test/libapt/fileutl_test.cc +++ b/test/libapt/fileutl_test.cc @@ -10,7 +10,7 @@ #include <stdlib.h> -int main(int argc,char *argv[]) +int main() { std::vector<std::string> files; diff --git a/test/libapt/getarchitectures_test.cc b/test/libapt/getarchitectures_test.cc index 807469263..508d5e458 100644 --- a/test/libapt/getarchitectures_test.cc +++ b/test/libapt/getarchitectures_test.cc @@ -7,7 +7,7 @@ #include <iostream> -int main(int argc,char *argv[]) +int main() { std::vector<std::string> vec; diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc index b6939231d..742fa53bd 100644 --- a/test/libapt/globalerror_test.cc +++ b/test/libapt/globalerror_test.cc @@ -5,7 +5,7 @@ #include <errno.h> #include <string.h> -int main(int argc,char *argv[]) +int main() { std::string const textOfErrnoZero(strerror(0)); diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc index 3da89052b..410e2c44d 100644 --- a/test/libapt/hashsums_test.cc +++ b/test/libapt/hashsums_test.cc @@ -43,6 +43,11 @@ template <class T> void TestMill(const char *Out) int main(int argc, char** argv) { + if (argc != 6) { + std::cout << "Five parameter expected - given " << argc << std::endl; + return 100; + } + // test HashSumValue which doesn't calculate but just stores sums { string md5sum = argv[2]; diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index 67dbab823..5a2c65573 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -3,7 +3,7 @@ #include "assert.h" -int main(int argc,char *argv[]) { +int main() { std::string Package; std::string Version; unsigned int Op = 5; diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index e79b6d65e..0637df03b 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -19,7 +19,7 @@ static void remove_tmpfile(void) } } -int main(int argc, char *argv[]) +int main() { _config->Set("APT::Sources::Use-Deb822", true); diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc index 8215654d0..a4516e7a1 100644 --- a/test/libapt/strutil_test.cc +++ b/test/libapt/strutil_test.cc @@ -2,7 +2,7 @@ #include "assert.h" -int main(int argc,char *argv[]) +int main() { std::string input, output, expected; diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc index effc3244b..24f258275 100644 --- a/test/libapt/tagfile_test.cc +++ b/test/libapt/tagfile_test.cc @@ -19,7 +19,7 @@ static void remove_tmpfile(void) } } -int main(int argc, char *argv[]) +int main() { FileFd fd; const char contents[] = "FieldA-12345678: the value of the field"; -- cgit v1.2.3 From 54298f49d71347616df19b8d2f59c907374e07b3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 1 Mar 2014 22:27:11 +0100 Subject: move defines for version to macros.h also adds namespaced attributes for good usage Git-Dch: Ignore --- apt-pkg/contrib/macros.h | 84 ++++++++++++++++++++++++++++++++++++++---------- apt-pkg/init.h | 11 +------ buildlib/libversion.mak | 6 ++-- prepare-release | 2 +- 4 files changed, 72 insertions(+), 31 deletions(-) diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index e53d01b8f..294242e68 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -54,37 +54,87 @@ #define CLRFLAG(v,f) ((v) &=~FLAG(f)) #define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) -// some nice optional GNUC features -#if __GNUC__ >= 3 - #define __must_check __attribute__ ((warn_unused_result)) - #define __deprecated __attribute__ ((deprecated)) - #define __attrib_const __attribute__ ((__const__)) - /* likely() and unlikely() can be used to mark boolean expressions - as (not) likely true which will help the compiler to optimise */ +#ifdef __GNUC__ +#define APT_GCC_VERSION (__GNUC__ << 8 | __GNUC_MINOR__) +#else +#define APT_GCC_VERSION 0 +#endif + +/* likely() and unlikely() can be used to mark boolean expressions + as (not) likely true which will help the compiler to optimise */ +#if APT_GCC_VERSION >= 0x0300 #define likely(x) __builtin_expect (!!(x), 1) #define unlikely(x) __builtin_expect (!!(x), 0) #else - #define __must_check /* no warn_unused_result */ - #define __deprecated /* no deprecated */ - #define __attrib_const /* no const attribute */ #define likely(x) (x) #define unlikely(x) (x) #endif +#if APT_GCC_VERSION >= 0x0300 + #define APT_UNUSED __attribute__((unused)) + #define APT_CONST __attribute__((const)) + #define APT_PURE __attribute__((pure)) + #define APT_NORETURN __attribute__((noreturn)) + #define APT_PRINTF(n) __attribute__((format(printf, n, n + 1))) +#else + #define APT_UNUSED + #define APT_CONST + #define APT_PURE + #define APT_NORETURN + #define APT_PRINTF(n) +#endif + +#if APT_GCC_VERSION > 0x0302 + #define APT_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) + #define APT_MUSTCHECK __attribute__((warn_unused_result)) +#else + #define APT_NONNULL(...) + #define APT_REQRET +#endif + +#if APT_GCC_VERSION >= 0x0400 + #define APT_SENTINEL __attribute__((sentinel)) +#else + #define APT_SENTINEL +#endif + // cold functions are unlikely() to be called -#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 - #define __cold __attribute__ ((__cold__)) - #define __hot __attribute__ ((__hot__)) +#if APT_GCC_VERSION >= 0x0403 + #define APT_COLD __attribute__ ((__cold__)) + #define APT_HOT __attribute__ ((__hot__)) #else - #define __cold /* no cold marker */ - #define __hot /* no hot marker */ + #define __cold + #define __hot #endif -#ifdef __GNUG__ -// Methods have a hidden this parameter that is visible to this attribute +#ifndef APT_10_CLEANER_HEADERS +#if APT_GCC_VERSION >= 0x0300 + #define __must_check __attribute__ ((warn_unused_result)) + #define __deprecated __attribute__ ((deprecated)) + #define __attrib_const __attribute__ ((__const__)) #define __like_printf(n) __attribute__((format(printf, n, n + 1))) #else + #define __must_check /* no warn_unused_result */ + #define __deprecated /* no deprecated */ + #define __attrib_const /* no const attribute */ #define __like_printf(n) /* no like-printf */ #endif +#if APT_GCC_VERSION >= 0x0403 + #define __cold __attribute__ ((__cold__)) + #define __hot __attribute__ ((__hot__)) +#else + #define __cold /* no cold marker */ + #define __hot /* no hot marker */ +#endif +#endif + +// These lines are extracted by the makefiles and the buildsystem +// Increasing MAJOR or MINOR results in the need of recompiling all +// reverse-dependencies of libapt-pkg against the new SONAME. +// Non-ABI-Breaks should only increase RELEASE number. +// See also buildlib/libversion.mak +#define APT_PKG_MAJOR 4 +#define APT_PKG_MINOR 12 +#define APT_PKG_RELEASE 0 #endif diff --git a/apt-pkg/init.h b/apt-pkg/init.h index b6f3df753..4ee7a95ac 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: init.h,v 1.9.2.2 2004/01/02 18:51:00 mdz Exp $ /* ###################################################################### Init - Initialize the package library @@ -17,19 +16,11 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/pkgsystem.h> #endif +#include <apt-pkg/macros.h> class pkgSystem; class Configuration; -// These lines are extracted by the makefiles and the buildsystem -// Increasing MAJOR or MINOR results in the need of recompiling all -// reverse-dependencies of libapt-pkg against the new SONAME. -// Non-ABI-Breaks should only increase RELEASE number. -// See also buildlib/libversion.mak -#define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 12 -#define APT_PKG_RELEASE 0 - extern const char *pkgVersion; extern const char *pkgLibVersion; diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak index 796c956e7..deb3da377 100644 --- a/buildlib/libversion.mak +++ b/buildlib/libversion.mak @@ -2,9 +2,9 @@ # Version number of libapt-pkg. # Please increase MAJOR with each ABI break, # with each non-ABI break to the lib, please increase RELEASE. -# The versionnumber is extracted from apt-pkg/init.h - see also there. -LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/init.h | sed 's/\.$$//') -LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/init.h | cut -d ' ' -f 3) +# The versionnumber is extracted from apt-pkg/macros.h - see also there. +LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/contrib/macros.h | sed 's/\.$$//') +LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/contrib/macros.h | cut -d ' ' -f 3) # Version number of libapt-inst # Please increase MAJOR with each ABI break, diff --git a/prepare-release b/prepare-release index 6229ee1fd..7b7fd1224 100755 --- a/prepare-release +++ b/prepare-release @@ -11,7 +11,7 @@ fi VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') -LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" +LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')" LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" librarysymbolsfromfile() { -- cgit v1.2.3 From 453b82a388013e522b3a1b9fcd6ed0810dab1f4f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 5 Mar 2014 22:11:25 +0100 Subject: cleanup headers and especially #includes everywhere Beside being a bit cleaner it hopefully also resolves oddball problems I have with high levels of parallel jobs. Git-Dch: Ignore Reported-By: iwyu (include-what-you-use) --- apt-inst/contrib/arfile.cc | 4 +- apt-inst/contrib/extracttar.cc | 6 ++- apt-inst/deb/debfile.cc | 12 +++-- apt-inst/deb/debfile.h | 6 ++- apt-inst/dirstream.cc | 1 - apt-inst/extract.cc | 9 +++- apt-inst/extract.h | 5 +- apt-inst/filelist.cc | 2 - apt-pkg/acquire-item.cc | 15 ++++-- apt-pkg/acquire-item.h | 4 ++ apt-pkg/acquire-method.cc | 12 ++++- apt-pkg/acquire-method.h | 1 + apt-pkg/acquire-worker.cc | 7 ++- apt-pkg/acquire-worker.h | 3 ++ apt-pkg/acquire.cc | 6 +++ apt-pkg/acquire.h | 7 ++- apt-pkg/algorithms.cc | 13 +++-- apt-pkg/algorithms.h | 5 +- apt-pkg/aptconfiguration.cc | 9 +++- apt-pkg/cachefile.cc | 9 +++- apt-pkg/cachefile.h | 9 +++- apt-pkg/cachefilter.cc | 4 +- apt-pkg/cachefilter.h | 1 + apt-pkg/cacheiterators.h | 4 ++ apt-pkg/cacheset.cc | 16 ++++-- apt-pkg/cacheset.h | 7 ++- apt-pkg/cdrom.cc | 34 ++++++------ apt-pkg/cdrom.h | 2 + apt-pkg/clean.cc | 4 ++ apt-pkg/clean.h | 7 ++- apt-pkg/contrib/cdromutl.cc | 5 +- apt-pkg/contrib/cmndline.cc | 5 ++ apt-pkg/contrib/configuration.cc | 13 +++-- apt-pkg/contrib/error.cc | 4 +- apt-pkg/contrib/error.h | 27 +++++----- apt-pkg/contrib/fileutl.cc | 12 +++-- apt-pkg/contrib/fileutl.h | 11 ++-- apt-pkg/contrib/gpgv.cc | 18 ++++--- apt-pkg/contrib/gpgv.h | 14 +++-- apt-pkg/contrib/hashes.cc | 6 ++- apt-pkg/contrib/hashes.h | 13 +++-- apt-pkg/contrib/hashsum.cc | 3 ++ apt-pkg/contrib/hashsum_template.h | 10 ++-- apt-pkg/contrib/macros.h | 8 +-- apt-pkg/contrib/md5.cc | 6 +-- apt-pkg/contrib/md5.h | 9 ++-- apt-pkg/contrib/mmap.cc | 4 +- apt-pkg/contrib/netrc.cc | 3 +- apt-pkg/contrib/netrc.h | 6 ++- apt-pkg/contrib/progress.cc | 2 + apt-pkg/contrib/sha1.cc | 5 +- apt-pkg/contrib/sha1.h | 7 +-- apt-pkg/contrib/sha2.h | 10 ++-- apt-pkg/contrib/sha2_internal.cc | 1 + apt-pkg/contrib/sha2_internal.h | 1 + apt-pkg/contrib/strutl.cc | 9 +++- apt-pkg/contrib/strutl.h | 23 +++++---- apt-pkg/deb/debindexfile.cc | 14 ++++- apt-pkg/deb/debindexfile.h | 10 +++- apt-pkg/deb/deblistparser.cc | 9 ++++ apt-pkg/deb/deblistparser.h | 7 +++ apt-pkg/deb/debmetaindex.cc | 11 +++- apt-pkg/deb/debmetaindex.h | 8 ++- apt-pkg/deb/debrecords.cc | 8 ++- apt-pkg/deb/debrecords.h | 3 ++ apt-pkg/deb/debsrcrecords.cc | 11 +++- apt-pkg/deb/debsrcrecords.h | 7 ++- apt-pkg/deb/debsystem.cc | 9 +++- apt-pkg/deb/debsystem.h | 10 +++- apt-pkg/deb/debversion.cc | 2 + apt-pkg/deb/debversion.h | 6 +-- apt-pkg/deb/dpkgpm.cc | 52 ++++++++++--------- apt-pkg/deb/dpkgpm.h | 13 ++++- apt-pkg/depcache.cc | 14 +++-- apt-pkg/depcache.h | 12 ++++- apt-pkg/edsp.cc | 17 ++++-- apt-pkg/edsp.h | 5 +- apt-pkg/edsp/edspindexfile.cc | 17 +++--- apt-pkg/edsp/edspindexfile.h | 4 ++ apt-pkg/edsp/edsplistparser.cc | 10 ++-- apt-pkg/edsp/edsplistparser.h | 4 ++ apt-pkg/edsp/edspsystem.cc | 15 +++--- apt-pkg/edsp/edspsystem.h | 9 ++++ apt-pkg/indexcopy.cc | 6 +-- apt-pkg/indexcopy.h | 10 ++-- apt-pkg/indexfile.cc | 10 +++- apt-pkg/indexfile.h | 15 +++--- apt-pkg/indexrecords.cc | 7 ++- apt-pkg/indexrecords.h | 6 ++- apt-pkg/init.cc | 4 +- apt-pkg/init.h | 2 + apt-pkg/install-progress.cc | 30 ++++++----- apt-pkg/metaindex.h | 15 ++++-- apt-pkg/orderlist.cc | 6 ++- apt-pkg/orderlist.h | 6 ++- apt-pkg/packagemanager.cc | 11 +++- apt-pkg/packagemanager.h | 12 +++-- apt-pkg/pkgcache.cc | 7 ++- apt-pkg/pkgcachegen.cc | 20 ++++--- apt-pkg/pkgcachegen.h | 12 +++-- apt-pkg/pkgrecords.cc | 6 ++- apt-pkg/pkgrecords.h | 3 +- apt-pkg/pkgsystem.cc | 1 - apt-pkg/pkgsystem.h | 2 +- apt-pkg/policy.cc | 10 +++- apt-pkg/policy.h | 5 +- apt-pkg/sourcelist.cc | 11 +++- apt-pkg/sourcelist.h | 12 ++++- apt-pkg/srcrecords.cc | 7 ++- apt-pkg/tagfile.cc | 2 + apt-pkg/update.cc | 23 +++------ apt-pkg/upgrade.cc | 19 +++---- apt-pkg/upgrade.h | 2 + apt-pkg/vendor.cc | 8 ++- apt-pkg/vendor.h | 2 +- apt-pkg/vendorlist.cc | 9 +++- apt-pkg/vendorlist.h | 2 +- apt-pkg/version.cc | 2 +- apt-pkg/versionmatch.cc | 7 ++- apt-pkg/versionmatch.h | 3 +- apt-private/acqprogress.cc | 5 +- apt-private/private-cachefile.cc | 12 +++-- apt-private/private-cachefile.h | 2 + apt-private/private-cacheset.cc | 13 ++++- apt-private/private-cacheset.h | 15 ++++++ apt-private/private-cmndline.cc | 6 +-- apt-private/private-download.cc | 6 +-- apt-private/private-download.h | 2 +- apt-private/private-install.cc | 68 ++++++++++-------------- apt-private/private-install.h | 18 ++++++- apt-private/private-list.cc | 43 +++++----------- apt-private/private-list.h | 2 +- apt-private/private-main.cc | 12 +++-- apt-private/private-main.h | 3 +- apt-private/private-moo.cc | 12 +++-- apt-private/private-output.cc | 14 +++-- apt-private/private-output.h | 5 +- apt-private/private-search.cc | 44 ++++++---------- apt-private/private-search.h | 2 +- apt-private/private-show.cc | 40 +++++++------- apt-private/private-show.h | 2 +- apt-private/private-sources.cc | 21 ++++++-- apt-private/private-sources.h | 7 ++- apt-private/private-update.cc | 39 +++++--------- apt-private/private-upgrade.cc | 18 ++++--- apt-private/private-upgrade.h | 4 +- apt-private/private-utils.cc | 8 +-- apt-private/private-utils.h | 2 - buildlib/apti18n.h.in | 3 +- buildlib/config.h.in | 1 + cmdline/acqprogress.cc | 2 + cmdline/apt-cache.cc | 51 ++++++++++-------- cmdline/apt-cdrom.cc | 9 +--- cmdline/apt-config.cc | 2 +- cmdline/apt-dump-solver.cc | 6 ++- cmdline/apt-extracttemplates.cc | 9 ++-- cmdline/apt-extracttemplates.h | 3 +- cmdline/apt-get.cc | 83 +++++++++++++++--------------- cmdline/apt-helper.cc | 12 ++--- cmdline/apt-internal-solver.cc | 10 +++- cmdline/apt-mark.cc | 29 +++++++---- cmdline/apt-sortpkgs.cc | 6 +-- cmdline/apt.cc | 40 +++----------- ftparchive/apt-ftparchive.cc | 17 ++++-- ftparchive/cachedb.cc | 4 ++ ftparchive/cachedb.h | 8 +-- ftparchive/contents.cc | 3 +- ftparchive/contents.h | 8 +-- ftparchive/multicompress.cc | 6 ++- ftparchive/multicompress.h | 3 +- ftparchive/override.cc | 3 ++ ftparchive/writer.cc | 25 ++++++--- ftparchive/writer.h | 4 +- methods/cdrom.cc | 4 +- methods/connect.cc | 2 +- methods/copy.cc | 3 +- methods/file.cc | 3 +- methods/ftp.cc | 5 ++ methods/ftp.h | 2 + methods/gpgv.cc | 16 +++--- methods/gzip.cc | 14 ++--- methods/http.cc | 13 ++--- methods/http.h | 4 ++ methods/http_main.cc | 5 -- methods/https.cc | 9 ++-- methods/https.h | 7 ++- methods/mirror.cc | 10 ++-- methods/mirror.h | 2 + methods/rred.cc | 5 +- methods/rsh.cc | 4 ++ methods/rsh.h | 2 + methods/server.cc | 27 ++++------ methods/server.h | 3 ++ test/interactive-helper/aptwebserver.cc | 34 ++++++------ test/interactive-helper/extract-control.cc | 3 ++ test/interactive-helper/mthdcat.cc | 2 + test/interactive-helper/rpmver.cc | 2 + test/interactive-helper/test_udevcdrom.cc | 8 +-- test/interactive-helper/testdeb.cc | 7 +++ test/libapt/cdromfindpackages_test.cc | 4 ++ test/libapt/cdromreducesourcelist_test.cc | 4 +- test/libapt/commandline_test.cc | 3 ++ test/libapt/commandlineasstring_test.cc | 2 + test/libapt/compareversion_test.cc | 9 ++-- test/libapt/configuration_test.cc | 2 + test/libapt/fileutl_test.cc | 7 ++- test/libapt/getarchitectures_test.cc | 5 +- test/libapt/getlanguages_test.cc | 2 + test/libapt/getlistoffilesindir_test.cc | 7 +-- test/libapt/globalerror_test.cc | 6 ++- test/libapt/hashsums_test.cc | 15 +++--- test/libapt/indexcopytosourcelist_test.cc | 9 ++-- test/libapt/parsedepends_test.cc | 6 +++ test/libapt/sourcelist_test.cc | 9 +++- test/libapt/strutil_test.cc | 7 ++- test/libapt/tagfile_test.cc | 6 ++- test/libapt/uri_test.cc | 4 ++ 217 files changed, 1348 insertions(+), 788 deletions(-) diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 77dbc55d6..905110781 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -21,7 +21,9 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/error.h> -#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <string> #include <apti18n.h> /*}}}*/ diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 41c509809..0ba3f0521 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -23,9 +23,11 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/macros.h> +#include <apt-pkg/fileutl.h> -#include <stdlib.h> +#include <string.h> +#include <algorithm> +#include <string> #include <unistd.h> #include <signal.h> #include <fcntl.h> diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 8684f03f7..3803329fa 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -21,11 +21,17 @@ #include <apt-pkg/debfile.h> #include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> -#include <apt-pkg/deblistparser.h> #include <apt-pkg/aptconfiguration.h> - +#include <apt-pkg/arfile.h> +#include <apt-pkg/dirstream.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/tagfile.h> + +#include <string.h> +#include <string> +#include <vector> #include <sys/stat.h> -#include <unistd.h> + #include <apti18n.h> /*}}}*/ diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index ecef71d21..880bcf6c5 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -27,11 +27,15 @@ #include <apt-pkg/arfile.h> #include <apt-pkg/dirstream.h> #include <apt-pkg/tagfile.h> -#include <apt-pkg/pkgcache.h> + +#include <string> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/md5.h> #endif +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/pkgcache.h> +#endif class FileFd; diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index 085a0dcbf..39ebb3bb4 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -18,7 +18,6 @@ #include <fcntl.h> #include <sys/stat.h> -#include <sys/types.h> #include <sys/time.h> #include <errno.h> #include <unistd.h> diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index 60edc702e..b2956d91d 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -50,13 +50,20 @@ #include <apt-pkg/error.h> #include <apt-pkg/debversion.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/dirstream.h> +#include <apt-pkg/filelist.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <string.h> +#include <string> #include <sys/stat.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <dirent.h> #include <iostream> + #include <apti18n.h> /*}}}*/ using namespace std; diff --git a/apt-inst/extract.h b/apt-inst/extract.h index 7143fa409..8ad9ac629 100644 --- a/apt-inst/extract.h +++ b/apt-inst/extract.h @@ -17,11 +17,12 @@ #ifndef PKGLIB_EXTRACT_H #define PKGLIB_EXTRACT_H - - #include <apt-pkg/dirstream.h> #include <apt-pkg/filelist.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <string> class pkgExtract : public pkgDirStream { diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index defc4f4df..b4a4f3d9d 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -39,8 +39,6 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include <iostream> #include <apti18n.h> diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 3b22743e7..44a1f32df 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -22,12 +22,21 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/indexrecords.h> -#include <apt-pkg/metaindex.h> - +#include <apt-pkg/acquire.h> +#include <apt-pkg/hashes.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgrecords.h> + +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <iostream> +#include <vector> #include <sys/stat.h> #include <unistd.h> #include <errno.h> diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 0524743c6..f48d2a0d7 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -24,6 +24,10 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/weakptr.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <string> +#include <vector> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/indexfile.h> diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 5bc1c159a..746c553f1 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -23,10 +23,18 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/hashes.h> - +#include <apt-pkg/md5.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/sha2.h> + +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <string> +#include <vector> #include <iostream> #include <stdio.h> -#include <sys/signal.h> /*}}}*/ using namespace std; diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 00f99e0a0..f0f2a537a 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -21,6 +21,7 @@ #define PKGLIB_ACQUIRE_METHOD_H #include <stdarg.h> +#include <time.h> #include <string> #include <vector> diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index de62080da..047a655ce 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -14,20 +14,23 @@ // Include Files /*{{{*/ #include <config.h> +#include <apt-pkg/acquire.h> #include <apt-pkg/acquire-worker.h> #include <apt-pkg/acquire-item.h> #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/hashes.h> +#include <string> +#include <vector> #include <iostream> #include <sstream> -#include <fstream> #include <sys/stat.h> +#include <stdlib.h> #include <unistd.h> -#include <fcntl.h> #include <signal.h> #include <stdio.h> #include <errno.h> diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index a558f69a7..67aee4b59 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -22,6 +22,9 @@ #include <apt-pkg/acquire.h> #include <apt-pkg/weakptr.h> +#include <sys/types.h> +#include <string> +#include <vector> /** \brief A fetch subprocess. * diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index e8fa68338..a654d8219 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -23,12 +23,18 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> +#include <string> +#include <vector> #include <iostream> #include <sstream> #include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include <dirent.h> #include <sys/time.h> +#include <sys/select.h> #include <errno.h> #include <apti18n.h> diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 2c0b37635..1aac0ba11 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -72,8 +72,13 @@ #include <vector> #include <string> +#include <stddef.h> #include <sys/time.h> +#include <sys/select.h> + +#ifndef APT_10_CLEANER_HEADERS #include <unistd.h> +#endif #ifndef APT_8_CLEANER_HEADERS using std::vector; @@ -353,7 +358,7 @@ class pkgAcquire void SetLog(pkgAcquireStatus *Progress) { Log = Progress; } /** \brief Construct a new pkgAcquire. */ - pkgAcquire(pkgAcquireStatus *Log) __deprecated; + pkgAcquire(pkgAcquireStatus *Log) APT_DEPRECATED; pkgAcquire(); /** \brief Destroy this pkgAcquire object. diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 2e167119d..a7b676660 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -19,19 +19,18 @@ #include <apt-pkg/algorithms.h> #include <apt-pkg/error.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/version.h> #include <apt-pkg/sptr.h> -#include <apt-pkg/acquire-item.h> #include <apt-pkg/edsp.h> -#include <apt-pkg/sourcelist.h> -#include <apt-pkg/fileutl.h> #include <apt-pkg/progress.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/packagemanager.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> -#include <sys/types.h> +#include <string.h> +#include <string> #include <cstdlib> -#include <algorithm> #include <iostream> -#include <stdio.h> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 489d81159..82b6426c6 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -33,8 +33,11 @@ #include <apt-pkg/packagemanager.h> #include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <iostream> +#include <string> #include <apt-pkg/macros.h> @@ -140,7 +143,7 @@ class pkgProblemResolver /*{{{*/ // Try to resolve problems only by using keep bool ResolveByKeep(); - __deprecated void InstallProtect(); + APT_DEPRECATED void InstallProtect(); pkgProblemResolver(pkgDepCache *Cache); ~pkgProblemResolver(); diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 4c609c603..941a9c334 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -17,14 +17,19 @@ #include <apt-pkg/macros.h> #include <apt-pkg/strutl.h> -#include <sys/types.h> #include <dirent.h> #include <stdio.h> #include <fcntl.h> - +#include <ctype.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include <algorithm> #include <string> #include <vector> + +#include <apti18n.h> /*}}}*/ namespace APT { // getCompressionTypes - Return Vector of usable compressiontypes /*{{{*/ diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 2401b015e..0fd40106f 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -21,9 +21,16 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/policy.h> #include <apt-pkg/pkgsystem.h> -#include <apt-pkg/acquire-item.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/progress.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> + +#include <string.h> +#include <unistd.h> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 802b12b61..36b20893a 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -17,8 +17,12 @@ #ifndef PKGLIB_CACHEFILE_H #define PKGLIB_CACHEFILE_H +#include <stddef.h> + #include <apt-pkg/depcache.h> #include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/acquire.h> @@ -26,6 +30,7 @@ #include <apt-pkg/sourcelist.h> #endif +class MMap; class pkgPolicy; class pkgSourceList; class OpProgress; @@ -60,13 +65,13 @@ class pkgCacheFile inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];}; bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true); - __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); }; + APT_DEPRECATED bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); }; bool BuildSourceList(OpProgress *Progress = NULL); bool BuildPolicy(OpProgress *Progress = NULL); bool BuildDepCache(OpProgress *Progress = NULL); bool Open(OpProgress *Progress = NULL, bool WithLock = true); inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); }; - __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); }; + APT_DEPRECATED bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); }; static void RemoveCaches(); void Close(); diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index 57b9af159..e388f2450 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -9,10 +9,12 @@ #include <apt-pkg/cachefilter.h> #include <apt-pkg/error.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/macros.h> #include <string> - +#include <string.h> #include <regex.h> #include <fnmatch.h> diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 81ae1383c..49d2855f5 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -7,6 +7,7 @@ #define APT_CACHEFILTER_H // Include Files /*{{{*/ #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <string> diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 64fec5daa..d9c8ed1e4 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -29,7 +29,11 @@ /*}}}*/ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H +#include<apt-pkg/pkgcache.h> + #include<iterator> +#include <iosfwd> +#include <string> #include<string.h> diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 8a30d00a2..a58631d5b 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -16,14 +16,22 @@ #include <apt-pkg/cachefilter.h> #include <apt-pkg/cacheset.h> #include <apt-pkg/error.h> -#include <apt-pkg/strutl.h> #include <apt-pkg/versionmatch.h> #include <apt-pkg/pkgrecords.h> #include <apt-pkg/policy.h> - -#include <vector> - +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> + +#include <stddef.h> +#include <stdio.h> +#include <string.h> #include <regex.h> +#include <list> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index ef28bbc34..16a3daa42 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -9,7 +9,6 @@ #ifndef APT_CACHESET_H #define APT_CACHESET_H // Include Files /*{{{*/ -#include <iostream> #include <fstream> #include <map> #include <set> @@ -17,11 +16,17 @@ #include <string> #include <iterator> +#include <stddef.h> + #include <apt-pkg/error.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/cachefile.h> +#endif +#ifndef APT_10_CLEANER_HEADERS +#include <iostream> #endif /*}}}*/ diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 6f946b030..262ff9eab 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -1,28 +1,30 @@ /* */ -#include<config.h> - -#include<apt-pkg/init.h> -#include<apt-pkg/error.h> -#include<apt-pkg/cdromutl.h> -#include<apt-pkg/strutl.h> -#include<apt-pkg/cdrom.h> -#include<apt-pkg/aptconfiguration.h> -#include<apt-pkg/configuration.h> -#include<apt-pkg/fileutl.h> - -#include<sstream> -#include<fstream> +#include <config.h> + +#include <apt-pkg/error.h> +#include <apt-pkg/cdromutl.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/cdrom.h> +#include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/indexcopy.h> + + +#include <string.h> +#include <iostream> +#include <string> +#include <vector> +#include <sstream> +#include <fstream> #include <sys/stat.h> -#include <fcntl.h> #include <dirent.h> #include <unistd.h> #include <stdio.h> #include <algorithm> #include <dlfcn.h> -#include "indexcopy.h" - #include<apti18n.h> using namespace std; diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index c58593550..f4a873808 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -4,6 +4,8 @@ #include<string> #include<vector> +#include <stddef.h> + #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/init.h> using namespace std; diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc index 2dea8ffdd..0ee3b765d 100644 --- a/apt-pkg/clean.cc +++ b/apt-pkg/clean.cc @@ -16,7 +16,11 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <string> +#include <string.h> #include <dirent.h> #include <sys/stat.h> #include <unistd.h> diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h index ad4049e83..930d54a7f 100644 --- a/apt-pkg/clean.h +++ b/apt-pkg/clean.h @@ -10,8 +10,13 @@ #ifndef APTPKG_CLEAN_H #define APTPKG_CLEAN_H - +#ifndef APT_10_CLEANER_HEADERS #include <apt-pkg/pkgcache.h> +#endif + +#include <string> + +class pkgCache; class pkgArchiveCleaner { diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 20210ec0a..096d3bcf5 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -19,7 +19,10 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> -#include <sys/wait.h> +#include <stdlib.h> +#include <string.h> +#include <iostream> +#include <string> #include <sys/statvfs.h> #include <dirent.h> #include <fcntl.h> diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index ed5800007..3799c822d 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -18,6 +18,11 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <string> + #include <apti18n.h> /*}}}*/ using namespace std; diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 003fd01d8..00f6ad0f9 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -21,11 +21,18 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/init.h> - +#include <apt-pkg/macros.h> + +#include <ctype.h> +#include <regex.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <algorithm> +#include <string> #include <vector> #include <fstream> -#include <iostream> #include <apti18n.h> diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 2d25f5ed9..892cd4874 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -17,12 +17,14 @@ #include <apt-pkg/error.h> +#include <stdarg.h> +#include <stddef.h> +#include <list> #include <iostream> #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> - #include <string> #include <cstring> diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index c06e45ee4..919b1e6d4 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -46,6 +46,7 @@ #include <list> #include <string> +#include <stddef.h> #include <stdarg.h> class GlobalError /*{{{*/ @@ -73,7 +74,7 @@ public: /*{{{*/ * * \return \b false */ - bool FatalE(const char *Function,const char *Description,...) __like_printf(3) __cold; + bool FatalE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD; /** \brief add an Error message with errno to the list * @@ -82,7 +83,7 @@ public: /*{{{*/ * * \return \b false */ - bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold; + bool Errno(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD; /** \brief add a warning message with errno to the list * @@ -94,7 +95,7 @@ public: /*{{{*/ * * \return \b false */ - bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold; + bool WarningE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD; /** \brief add a notice message with errno to the list * @@ -103,7 +104,7 @@ public: /*{{{*/ * * \return \b false */ - bool NoticeE(const char *Function,const char *Description,...) __like_printf(3) __cold; + bool NoticeE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD; /** \brief add a debug message with errno to the list * @@ -112,7 +113,7 @@ public: /*{{{*/ * * \return \b false */ - bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold; + bool DebugE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD; /** \brief adds an errno message with the given type * @@ -121,7 +122,7 @@ public: /*{{{*/ * \param Description of the error */ bool InsertErrno(MsgType const &type, const char* Function, - const char* Description,...) __like_printf(4) __cold; + const char* Description,...) APT_PRINTF(4) APT_COLD; /** \brief adds an errno message with the given type * @@ -155,7 +156,7 @@ public: /*{{{*/ * * \return \b false */ - bool Fatal(const char *Description,...) __like_printf(2) __cold; + bool Fatal(const char *Description,...) APT_PRINTF(2) APT_COLD; /** \brief add an Error message to the list * @@ -163,7 +164,7 @@ public: /*{{{*/ * * \return \b false */ - bool Error(const char *Description,...) __like_printf(2) __cold; + bool Error(const char *Description,...) APT_PRINTF(2) APT_COLD; /** \brief add a warning message to the list * @@ -174,7 +175,7 @@ public: /*{{{*/ * * \return \b false */ - bool Warning(const char *Description,...) __like_printf(2) __cold; + bool Warning(const char *Description,...) APT_PRINTF(2) APT_COLD; /** \brief add a notice message to the list * @@ -187,7 +188,7 @@ public: /*{{{*/ * * \return \b false */ - bool Notice(const char *Description,...) __like_printf(2) __cold; + bool Notice(const char *Description,...) APT_PRINTF(2) APT_COLD; /** \brief add a debug message to the list * @@ -195,14 +196,14 @@ public: /*{{{*/ * * \return \b false */ - bool Debug(const char *Description,...) __like_printf(2) __cold; + bool Debug(const char *Description,...) APT_PRINTF(2) APT_COLD; /** \brief adds an error message with the given type * * \param type of the error message * \param Description of the error */ - bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold; + bool Insert(MsgType const &type, const char* Description,...) APT_PRINTF(3) APT_COLD; /** \brief adds an error message with the given type * @@ -218,7 +219,7 @@ public: /*{{{*/ * should call this method again in that case */ bool Insert(MsgType type, const char* Description, - va_list &args, size_t &msgSize) __cold; + va_list &args, size_t &msgSize) APT_COLD; /** \brief is an error in the list? * diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 464950abd..55ba41128 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -26,16 +26,22 @@ #include <apt-pkg/sptr.h> #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> - +#include <apt-pkg/macros.h> + +#include <ctype.h> +#include <stdarg.h> +#include <stddef.h> +#include <sys/select.h> +#include <time.h> +#include <string> +#include <vector> #include <cstdlib> #include <cstring> #include <cstdio> - #include <iostream> #include <unistd.h> #include <fcntl.h> #include <sys/stat.h> -#include <sys/types.h> #include <sys/time.h> #include <sys/wait.h> #include <dirent.h> diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index e752e9621..6fdea1294 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -27,6 +27,7 @@ #include <string> #include <vector> #include <set> +#include <time.h> #include <zlib.h> @@ -94,7 +95,7 @@ class FileFd And as the auto-conversation converts a 'unsigned long *' to a 'bool' instead of 'unsigned long long *' we need to provide this explicitely - otherwise applications magically start to fail… */ - __deprecated bool Read(void *To,unsigned long long Size,unsigned long *Actual) + bool Read(void *To,unsigned long long Size,unsigned long *Actual) APT_DEPRECATED { unsigned long long R; bool const T = Read(To, Size, &R); @@ -118,7 +119,7 @@ class FileFd // Simple manipulators inline int Fd() {return iFd;}; inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);}; - __deprecated gzFile gzFd(); + gzFile gzFd() APT_DEPRECATED; inline bool IsOpen() {return iFd >= 0;}; inline bool Failed() {return (Flags & Fail) == Fail;}; @@ -152,8 +153,8 @@ class FileFd bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor); // private helpers to set Fail flag and call _error->Error - bool FileFdErrno(const char* Function, const char* Description,...) __like_printf(3) __cold; - bool FileFdError(const char* Description,...) __like_printf(2) __cold; + bool FileFdErrno(const char* Function, const char* Description,...) APT_PRINTF(3) APT_COLD; + bool FileFdError(const char* Description,...) APT_PRINTF(2) APT_COLD; }; bool RunScripts(const char *Cnf); @@ -161,7 +162,7 @@ bool CopyFile(FileFd &From,FileFd &To); int GetLock(std::string File,bool Errors = true); bool FileExists(std::string File); bool RealFileExists(std::string File); -bool DirectoryExists(std::string const &Path) __attrib_const; +bool DirectoryExists(std::string const &Path) APT_CONST; bool CreateDirectory(std::string const &Parent, std::string const &Path); time_t GetModificationTime(std::string const &Path); diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 9de227062..f24dd9640 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -2,21 +2,23 @@ // Include Files /*{{{*/ #include<config.h> +#include<apt-pkg/configuration.h> +#include<apt-pkg/error.h> +#include<apt-pkg/strutl.h> +#include<apt-pkg/fileutl.h> +#include<apt-pkg/gpgv.h> + #include <errno.h> #include <stdio.h> #include <string.h> #include <stdlib.h> #include <fcntl.h> -#include <sys/stat.h> -#include <sys/types.h> #include <sys/wait.h> #include <unistd.h> - -#include<apt-pkg/configuration.h> -#include<apt-pkg/error.h> -#include<apt-pkg/strutl.h> -#include<apt-pkg/fileutl.h> -#include<apt-pkg/gpgv.h> +#include <stddef.h> +#include <iostream> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index d9712d6a8..ab3c68de5 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -9,17 +9,17 @@ #ifndef CONTRIB_GPGV_H #define CONTRIB_GPGV_H +#include <apt-pkg/macros.h> + #include <string> #include <vector> +#ifndef APT_10_CLEANER_HEADERS #include <apt-pkg/fileutl.h> - -#if __GNUC__ >= 4 - #define APT_noreturn __attribute__ ((noreturn)) -#else - #define APT_noreturn /* no support */ #endif +class FileFd; + /** \brief generates and run the command to verify a file with gpgv * * If File and FileSig specify the same file it is assumed that we @@ -40,15 +40,13 @@ * @param FileSig is the signature (detached or clear-signed) */ void ExecGPGV(std::string const &File, std::string const &FileSig, - int const &statusfd, int fd[2]) APT_noreturn; + int const &statusfd, int fd[2]) APT_NORETURN; inline void ExecGPGV(std::string const &File, std::string const &FileSig, int const &statusfd = -1) { int fd[2]; ExecGPGV(File, FileSig, statusfd, fd); } -#undef APT_noreturn - /** \brief Split an inline signature into message and signature * * Takes a clear-signed message and puts the first signed message diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 890573d9c..5efafa511 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -16,8 +16,12 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/macros.h> +#include <apt-pkg/md5.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/sha2.h> +#include <stddef.h> +#include <algorithm> #include <unistd.h> #include <string> #include <iostream> diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 636cad257..979ee1eb8 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -17,17 +17,22 @@ #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> #include <apt-pkg/sha2.h> -#include <apt-pkg/fileutl.h> -#include <algorithm> -#include <vector> #include <cstring> - +#include <string> #ifndef APT_8_CLEANER_HEADERS using std::min; using std::vector; #endif +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> +#include <algorithm> +#include <vector> +#endif + + +class FileFd; // helper class that contains hash function name // and hash diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc index d02177724..25ccc187d 100644 --- a/apt-pkg/contrib/hashsum.cc +++ b/apt-pkg/contrib/hashsum.cc @@ -1,6 +1,9 @@ // Cryptographic API Base #include <config.h> +#include <apt-pkg/fileutl.h> + +#include <algorithm> #include <unistd.h> #include "hashsum_template.h" diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index f96188eb8..869dc5cb7 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -10,20 +10,24 @@ #ifndef APTPKG_HASHSUM_TEMPLATE_H #define APTPKG_HASHSUM_TEMPLATE_H -#include <apt-pkg/fileutl.h> #include <string> #include <cstring> -#include <algorithm> -#include <stdint.h> #include <apt-pkg/strutl.h> +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> +#include <algorithm> +#include <stdint.h> +#endif #ifndef APT_8_CLEANER_HEADERS using std::string; using std::min; #endif +class FileFd; + template<int N> class HashSumValue { diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 294242e68..d97053553 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -71,13 +71,13 @@ #endif #if APT_GCC_VERSION >= 0x0300 - #define APT_UNUSED __attribute__((unused)) + #define APT_DEPRECATED __attribute__ ((deprecated)) #define APT_CONST __attribute__((const)) #define APT_PURE __attribute__((pure)) #define APT_NORETURN __attribute__((noreturn)) #define APT_PRINTF(n) __attribute__((format(printf, n, n + 1))) #else - #define APT_UNUSED + #define APT_DEPRECATED #define APT_CONST #define APT_PURE #define APT_NORETURN @@ -103,8 +103,8 @@ #define APT_COLD __attribute__ ((__cold__)) #define APT_HOT __attribute__ ((__hot__)) #else - #define __cold - #define __hot + #define APT_COLD + #define APT_HOT #endif #ifndef APT_10_CLEANER_HEADERS diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index 4351aeb22..b487a96f9 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -38,13 +38,9 @@ #include <config.h> #include <apt-pkg/md5.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/macros.h> +#include <stdint.h> #include <string.h> -#include <unistd.h> -#include <netinet/in.h> // For htonl -#include <inttypes.h> /*}}}*/ // byteSwap - Swap bytes in a buffer /*{{{*/ diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 195455645..f4992c223 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -23,14 +23,15 @@ #ifndef APTPKG_MD5_H #define APTPKG_MD5_H - -#include <string> -#include <cstring> -#include <algorithm> #include <stdint.h> #include "hashsum_template.h" +#ifndef APT_10_CLEANER_HEADERS +#include <string> +#include <cstring> +#include <algorithm> +#endif #ifndef APT_8_CLEANER_HEADERS using std::string; using std::min; diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 37acba340..b2a53a6cb 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -22,11 +22,11 @@ #include <apt-pkg/mmap.h> #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/macros.h> +#include <string> #include <sys/mman.h> -#include <sys/stat.h> #include <unistd.h> -#include <fcntl.h> #include <stdlib.h> #include <errno.h> #include <cstring> diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index 32b146581..feaed67c8 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -15,14 +15,13 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> -#include <apt-pkg/error.h> -#include <apt-pkg/fileutl.h> #include <iostream> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <stddef.h> #include <pwd.h> #include "netrc.h" diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 6feb5b726..dbeb45386 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -16,6 +16,8 @@ #include <string> +#include <apt-pkg/macros.h> + #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/strutl.h> #endif @@ -25,9 +27,9 @@ class URI; -// kill this export on the next ABI break - strongly doubt its in use anyway +// FIXME: kill this export on the next ABI break - strongly doubt its in use anyway // outside of the apt itself, its really a internal interface -__deprecated int parsenetrc (char *host, char *login, char *password, char *filename); +APT_DEPRECATED int parsenetrc (char *host, char *login, char *password, char *filename); void maybe_add_auth (URI &Uri, std::string NetRCFile); #endif diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 9d74ed495..4ff4f181d 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -14,6 +14,8 @@ #include <apt-pkg/error.h> #include <apt-pkg/configuration.h> +#include <sys/time.h> +#include <string> #include <iostream> #include <stdio.h> #include <cstring> diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index b5a6a2440..bf6bc6cb6 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -32,12 +32,9 @@ #include <config.h> #include <apt-pkg/sha1.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/macros.h> +#include <stdint.h> #include <string.h> -#include <unistd.h> -#include <inttypes.h> /*}}}*/ // SHA1Transform - Alters an existing SHA-1 hash /*{{{*/ diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index a8d55eb13..5770c315a 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -14,12 +14,13 @@ #ifndef APTPKG_SHA1_H #define APTPKG_SHA1_H +#include "hashsum_template.h" + +#ifndef APT_10_CLEANER_HEADERS #include <string> #include <cstring> #include <algorithm> - -#include "hashsum_template.h" - +#endif #ifndef APT_8_CLEANER_HEADERS using std::string; using std::min; diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h index 8e0c99a1b..a25ad4d32 100644 --- a/apt-pkg/contrib/sha2.h +++ b/apt-pkg/contrib/sha2.h @@ -14,14 +14,18 @@ #ifndef APTPKG_SHA2_H #define APTPKG_SHA2_H -#include <string> #include <cstring> -#include <algorithm> -#include <stdint.h> #include "sha2_internal.h" #include "hashsum_template.h" +#ifndef APT_10_CLEANER_HEADERS +#include <string> +#include <algorithm> +#include <stdint.h> +#endif + + typedef HashSumValue<512> SHA512SumValue; typedef HashSumValue<256> SHA256SumValue; diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc index bb2560252..131ff5beb 100644 --- a/apt-pkg/contrib/sha2_internal.cc +++ b/apt-pkg/contrib/sha2_internal.cc @@ -33,6 +33,7 @@ */ #include <config.h> +#include <endian.h> #include <string.h> /* memcpy()/memset() or bcopy()/bzero() */ #include <assert.h> /* assert() */ #include "sha2_internal.h" diff --git a/apt-pkg/contrib/sha2_internal.h b/apt-pkg/contrib/sha2_internal.h index d9d429c92..1b82d965d 100644 --- a/apt-pkg/contrib/sha2_internal.h +++ b/apt-pkg/contrib/sha2_internal.h @@ -44,6 +44,7 @@ #ifdef SHA2_USE_INTTYPES_H +#include <stddef.h> #include <inttypes.h> #endif /* SHA2_USE_INTTYPES_H */ diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 61fcc6a7d..2100ee47b 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -21,6 +21,11 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/error.h> +#include <stddef.h> +#include <stdlib.h> +#include <time.h> +#include <string> +#include <vector> #include <ctype.h> #include <string.h> #include <sstream> @@ -33,9 +38,9 @@ #include <iconv.h> #include <apti18n.h> - -using namespace std; /*}}}*/ +using namespace std; + // Strip - Remove white space from the front and back of a string /*{{{*/ // --------------------------------------------------------------------- namespace APT { diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 3a6d38b75..79479957d 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -18,15 +18,18 @@ #include <limits> -#include <stdlib.h> #include <string> #include <cstring> #include <vector> #include <iostream> #include <time.h> +#include <stddef.h> #include "macros.h" +#ifndef APT_10_CLEANER_HEADERS +#include <stdlib.h> +#endif #ifndef APT_8_CLEANER_HEADERS using std::string; using std::vector; @@ -60,9 +63,9 @@ std::string Base64Encode(const std::string &Str); std::string OutputInDepth(const unsigned long Depth, const char* Separator=" "); std::string URItoFileName(const std::string &URI); std::string TimeRFC1123(time_t Date); -bool RFC1123StrToTime(const char* const str,time_t &time) __must_check; -bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check; -__deprecated bool StrToTime(const std::string &Val,time_t &Result); +bool RFC1123StrToTime(const char* const str,time_t &time) APT_MUSTCHECK; +bool FTPMDTMStrToTime(const char* const str,time_t &time) APT_MUSTCHECK; +APT_DEPRECATED bool StrToTime(const std::string &Val,time_t &Result); std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0); int StringToBool(const std::string &Text,int Default = -1); bool ReadMessages(int Fd, std::vector<std::string> &List); @@ -76,7 +79,7 @@ bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); // split a given string by a char -std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const; +std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_CONST; /* \brief Return a vector of strings from string "input" where "sep" * is used as the delimiter string. @@ -94,13 +97,13 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const */ std::vector<std::string> StringSplit(std::string const &input, std::string const &sep, - unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) __attrib_const; + unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) APT_CONST; -void ioprintf(std::ostream &out,const char *format,...) __like_printf(2); -void strprintf(std::string &out,const char *format,...) __like_printf(2); -char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3); +void ioprintf(std::ostream &out,const char *format,...) APT_PRINTF(2); +void strprintf(std::string &out,const char *format,...) APT_PRINTF(2); +char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_PRINTF(3); bool CheckDomainList(const std::string &Host, const std::string &List); -int tolower_ascii(int const c) __attrib_const __hot; +int tolower_ascii(int const c) APT_CONST APT_HOT; std::string StripEpoch(const std::string &VerStr); #define APT_MKSTRCMP(name,func) \ diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 909dfcf47..1b35d0d52 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -15,7 +15,6 @@ #include <apt-pkg/debsrcrecords.h> #include <apt-pkg/deblistparser.h> #include <apt-pkg/debrecords.h> -#include <apt-pkg/sourcelist.h> #include <apt-pkg/configuration.h> #include <apt-pkg/progress.h> #include <apt-pkg/error.h> @@ -23,7 +22,18 @@ #include <apt-pkg/acquire-item.h> #include <apt-pkg/debmetaindex.h> #include <apt-pkg/gpgv.h> - +#include <apt-pkg/fileutl.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgcachegen.h> +#include <apt-pkg/pkgrecords.h> +#include <apt-pkg/srcrecords.h> + +#include <stdio.h> +#include <iostream> +#include <string> #include <sys/stat.h> /*}}}*/ diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index e079d40c2..3bcb3b64f 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -16,9 +16,17 @@ #ifndef PKGLIB_DEBINDEXFILE_H #define PKGLIB_DEBINDEXFILE_H +#include <apt-pkg/indexfile.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/srcrecords.h> +#include <string> + +class OpProgress; +class pkgAcquire; +class pkgCacheGenerator; -#include <apt-pkg/indexfile.h> class debStatusIndex : public pkgIndexFile { diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 3374865ac..7777d654e 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -21,8 +21,17 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/crc-16.h> #include <apt-pkg/md5.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/tagfile.h> #include <apt-pkg/macros.h> +#include <stddef.h> +#include <string.h> +#include <algorithm> +#include <string> +#include <vector> #include <ctype.h> /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 0531b20f3..c0973260f 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -13,11 +13,18 @@ #include <apt-pkg/pkgcachegen.h> #include <apt-pkg/tagfile.h> +#include <apt-pkg/md5.h> +#include <apt-pkg/pkgcache.h> + +#include <string> +#include <vector> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/indexfile.h> #endif +class FileFd; + class debListParser : public pkgCacheGenerator::ListParser { public: diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 504877558..6fd12add8 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -9,8 +9,15 @@ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/indexrecords.h> #include <apt-pkg/sourcelist.h> -#include <apt-pkg/error.h> - +#include <apt-pkg/hashes.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/metaindex.h> + +#include <string.h> +#include <map> +#include <string> +#include <utility> +#include <vector> #include <set> #include <algorithm> diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index cef8d68f7..2286fa8b2 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -3,7 +3,7 @@ #define PKGLIB_DEBMETAINDEX_H #include <apt-pkg/metaindex.h> -#include <apt-pkg/init.h> +#include <apt-pkg/macros.h> #include <map> #include <string> @@ -12,6 +12,12 @@ #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/sourcelist.h> #endif +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/init.h> +#endif + +class pkgAcquire; +class pkgIndexFile; class debReleaseIndex : public metaIndex { public: diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 184c07c33..6063db5a8 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -12,10 +12,16 @@ #include <apt-pkg/debrecords.h> #include <apt-pkg/strutl.h> -#include <apt-pkg/error.h> #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/tagfile.h> +#include <string.h> +#include <algorithm> +#include <string> +#include <vector> #include <langinfo.h> /*}}}*/ diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index b5e3bbdba..bdac6c90b 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -17,6 +17,9 @@ #include <apt-pkg/pkgrecords.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/pkgcache.h> + +#include <string> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/indexfile.h> diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index daa54d036..b09588dd3 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -15,12 +15,19 @@ #include <apt-pkg/debsrcrecords.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> -#include <apt-pkg/configuration.h> #include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/srcrecords.h> +#include <apt-pkg/tagfile.h> -using std::max; +#include <ctype.h> +#include <stdlib.h> +#include <string.h> +#include <algorithm> +#include <string> +#include <vector> /*}}}*/ +using std::max; using std::string; // SrcRecordParser::Binaries - Return the binaries field /*{{{*/ diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index a8fb465bb..b65d1480b 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -11,11 +11,16 @@ #ifndef PKGLIB_DEBSRCRECORDS_H #define PKGLIB_DEBSRCRECORDS_H - #include <apt-pkg/srcrecords.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/fileutl.h> +#include <stddef.h> +#include <string> +#include <vector> + +class pkgIndexFile; + class debSrcRecordParser : public pkgSrcRecords::Parser { /** \brief dpointer placeholder (for later in case we need it) */ diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index b95ff15df..db557e537 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -19,7 +19,14 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> -#include <sys/types.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <ctype.h> +#include <stdlib.h> +#include <string.h> +#include <string> +#include <vector> #include <unistd.h> #include <dirent.h> #include <errno.h> diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h index 855123516..a945f68fb 100644 --- a/apt-pkg/deb/debsystem.h +++ b/apt-pkg/deb/debsystem.h @@ -12,11 +12,19 @@ #include <apt-pkg/pkgsystem.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <vector> +class Configuration; +class pkgIndexFile; +class pkgPackageManager; class debSystemPrivate; -class debStatusIndex; class pkgDepCache; +#ifndef APT_10_CLEANER_HEADERS +class debStatusIndex; +#endif + class debSystem : public pkgSystem { // private d-pointer diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index 74e2552ff..a5eacb7f5 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -15,6 +15,8 @@ #include <apt-pkg/debversion.h> #include <apt-pkg/pkgcache.h> +#include <string.h> +#include <string> #include <stdlib.h> #include <ctype.h> /*}}}*/ diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h index f1d6f3cc5..981ea9ad2 100644 --- a/apt-pkg/deb/debversion.h +++ b/apt-pkg/deb/debversion.h @@ -12,12 +12,12 @@ #ifndef PKGLIB_DEBVERSION_H #define PKGLIB_DEBVERSION_H +#include <apt-pkg/version.h> +#include <string> -#include <apt-pkg/version.h> - class debVersioningSystem : public pkgVersioningSystem -{ +{ public: static int CmpFragment(const char *A, const char *AEnd, const char *B, diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index adf59516e..9fee7c923 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -10,41 +10,45 @@ // Includes /*{{{*/ #include <config.h> -#include <apt-pkg/dpkgpm.h> -#include <apt-pkg/error.h> +#include <apt-pkg/cachefile.h> #include <apt-pkg/configuration.h> #include <apt-pkg/depcache.h> -#include <apt-pkg/pkgrecords.h> -#include <apt-pkg/strutl.h> +#include <apt-pkg/dpkgpm.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/cachefile.h> -#include <apt-pkg/packagemanager.h> #include <apt-pkg/install-progress.h> +#include <apt-pkg/packagemanager.h> +#include <apt-pkg/pkgrecords.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> -#include <unistd.h> -#include <stdlib.h> +#include <errno.h> #include <fcntl.h> +#include <grp.h> +#include <pty.h> +#include <pwd.h> +#include <signal.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/ioctl.h> #include <sys/select.h> #include <sys/stat.h> -#include <sys/types.h> +#include <sys/time.h> #include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <string.h> -#include <stdio.h> -#include <string.h> -#include <algorithm> -#include <sstream> -#include <map> -#include <pwd.h> -#include <grp.h> -#include <iomanip> - #include <termios.h> +#include <time.h> #include <unistd.h> -#include <sys/ioctl.h> -#include <pty.h> -#include <stdio.h> +#include <algorithm> +#include <cstring> +#include <iostream> +#include <map> +#include <set> +#include <string> +#include <utility> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index c144f78e1..859c74b46 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -11,11 +11,20 @@ #define PKGLIB_DPKGPM_H #include <apt-pkg/packagemanager.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/macros.h> + #include <vector> #include <map> #include <stdio.h> -#include <apt-pkg/macros.h> +#include <string> + +#ifndef APT_10_CLEANER_HEADERS #include <apt-pkg/init.h> +#endif + +class pkgDepCache; +namespace APT { namespace Progress { class PackageManager; } } #ifndef APT_8_CLEANER_HEADERS using std::vector; @@ -82,7 +91,7 @@ class pkgDPkgPM : public pkgPackageManager // Helpers bool RunScriptsWithPkgs(const char *Cnf); - __deprecated bool SendV2Pkgs(FILE *F); + APT_DEPRECATED bool SendV2Pkgs(FILE *F); bool SendPkgsInfo(FILE * const F, unsigned int const &Version); void WriteHistoryTag(std::string const &tag, std::string value); std::string ExpandShortPackageName(pkgDepCache &Cache, diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index b45f5d9b5..149dbc0e7 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -11,20 +11,26 @@ #include<config.h> #include <apt-pkg/depcache.h> -#include <apt-pkg/version.h> #include <apt-pkg/versionmatch.h> #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> -#include <apt-pkg/algorithms.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> #include <apt-pkg/aptconfiguration.h> -#include <apt-pkg/pkgsystem.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/progress.h> #include <apt-pkg/cacheset.h> - +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/macros.h> + +#include <stdio.h> +#include <string.h> +#include <list> +#include <string> +#include <utility> +#include <vector> #include <algorithm> #include <iostream> #include <sstream> diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 50f810806..3ffc3b47d 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -40,18 +40,26 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <stddef.h> -#include <vector> #include <memory> -#include <set> #include <list> +#include <string> +#include <utility> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/progress.h> #include <apt-pkg/error.h> #endif +#ifndef APT_10_CLEANER_HEADERS +#include <set> +#include <vector> +#endif class OpProgress; +class pkgVersioningSystem; class pkgDepCache : protected pkgCache::Namespace { diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index dbd2dba46..ee42267bc 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -11,16 +11,25 @@ #include <apt-pkg/error.h> #include <apt-pkg/cacheset.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/version.h> -#include <apt-pkg/policy.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/progress.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/strutl.h> -#include <limits> +#include <ctype.h> +#include <stddef.h> +#include <string.h> +#include <time.h> +#include <unistd.h> #include <stdio.h> - +#include <iostream> +#include <vector> +#include <limits> #include <string> +#include <list> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index 828ee3753..ae20ed7db 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -9,8 +9,11 @@ #ifndef PKGLIB_EDSP_H #define PKGLIB_EDSP_H -#include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheset.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <stdio.h> #include <list> #include <string> diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index 80b9f79ea..10313fd61 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -10,15 +10,20 @@ #include <apt-pkg/edspindexfile.h> #include <apt-pkg/edsplistparser.h> -#include <apt-pkg/sourcelist.h> -#include <apt-pkg/configuration.h> -#include <apt-pkg/progress.h> #include <apt-pkg/error.h> -#include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/acquire-item.h> +#include <apt-pkg/progress.h> +#include <apt-pkg/debindexfile.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgcachegen.h> +#include <apt-pkg/pkgrecords.h> -#include <sys/stat.h> +#include <stddef.h> +#include <unistd.h> +#include <string> /*}}}*/ // edspIndex::edspIndex - Constructor /*{{{*/ diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h index de10f2d2f..bd3b41cf2 100644 --- a/apt-pkg/edsp/edspindexfile.h +++ b/apt-pkg/edsp/edspindexfile.h @@ -9,11 +9,15 @@ #define PKGLIB_EDSPINDEXFILE_H #include <apt-pkg/debindexfile.h> +#include <string> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/indexfile.h> #endif +class OpProgress; +class pkgCacheGenerator; + class edspIndex : public debStatusIndex { /** \brief dpointer placeholder (for later in case we need it) */ diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc index 37959f37b..139deb9f1 100644 --- a/apt-pkg/edsp/edsplistparser.cc +++ b/apt-pkg/edsp/edsplistparser.cc @@ -12,11 +12,13 @@ #include <config.h> #include <apt-pkg/edsplistparser.h> -#include <apt-pkg/error.h> -#include <apt-pkg/configuration.h> -#include <apt-pkg/strutl.h> #include <apt-pkg/md5.h> -#include <apt-pkg/macros.h> +#include <apt-pkg/deblistparser.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/tagfile.h> + +#include <string> /*}}}*/ // ListParser::edspListParser - Constructor /*{{{*/ diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h index a7bf9de95..959fb587f 100644 --- a/apt-pkg/edsp/edsplistparser.h +++ b/apt-pkg/edsp/edsplistparser.h @@ -12,6 +12,10 @@ #define PKGLIB_EDSPLISTPARSER_H #include <apt-pkg/deblistparser.h> +#include <apt-pkg/md5.h> +#include <apt-pkg/pkgcache.h> + +#include <string> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/pkgcachegen.h> diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc index b509fa001..92edb8d77 100644 --- a/apt-pkg/edsp/edspsystem.cc +++ b/apt-pkg/edsp/edspsystem.cc @@ -11,16 +11,17 @@ // Include Files /*{{{*/ #include <config.h> -#include <apt-pkg/edspsystem.h> +#include <apt-pkg/configuration.h> #include <apt-pkg/debversion.h> #include <apt-pkg/edspindexfile.h> -#include <apt-pkg/configuration.h> -#include <apt-pkg/error.h> +#include <apt-pkg/edspsystem.h> #include <apt-pkg/fileutl.h> -#include <sys/types.h> -#include <unistd.h> -#include <dirent.h> -#include <errno.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <stddef.h> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h index ca703fa84..eafff39ba 100644 --- a/apt-pkg/edsp/edspsystem.h +++ b/apt-pkg/edsp/edspsystem.h @@ -11,8 +11,17 @@ #define PKGLIB_EDSPSYSTEM_H #include <apt-pkg/pkgsystem.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgcache.h> +#include <vector> + +class Configuration; +class pkgDepCache; +class pkgIndexFile; +class pkgPackageManager; class edspIndex; + class edspSystem : public pkgSystem { /** \brief dpointer placeholder (for later in case we need it) */ diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 59afa86ec..3a1385fa5 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -20,17 +20,17 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/indexrecords.h> -#include <apt-pkg/md5.h> #include <apt-pkg/cdrom.h> +#include <apt-pkg/gpgv.h> +#include <apt-pkg/hashes.h> #include <iostream> #include <sstream> #include <unistd.h> #include <sys/stat.h> -#include <sys/types.h> -#include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include "indexcopy.h" #include <apti18n.h> diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index e6a07a887..43cdb3f0a 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -14,16 +14,18 @@ #include <string> #include <stdio.h> -#include <apt-pkg/gpgv.h> #include <apt-pkg/macros.h> +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/gpgv.h> +class FileFd; +#endif #ifndef APT_8_CLEANER_HEADERS using std::string; using std::vector; #endif class pkgTagSection; -class FileFd; class indexRecords; class pkgCdromStatus; @@ -99,9 +101,9 @@ class SigVerify /*{{{*/ bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList, std::vector<std::string> PkgList,std::vector<std::string> SrcList); - __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, + APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd, int fd[2]); - __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, + APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd = -1); }; /*}}}*/ diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 875c80336..89615cb41 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -13,7 +13,13 @@ #include <apt-pkg/indexfile.h> #include <apt-pkg/error.h> #include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/srcrecords.h> +#include <apt-pkg/macros.h> +#include <string> +#include <vector> #include <clocale> #include <cstring> /*}}}*/ @@ -82,7 +88,7 @@ bool pkgIndexFile::TranslationsAvailable() { is already done in getLanguages(). Note also that this check is rather bad (doesn't take three character like ast into account). TODO: Remove method with next API break */ -__attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *Lang) +APT_DEPRECATED bool pkgIndexFile::CheckLanguageCode(const char *Lang) { if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_')) return true; @@ -98,7 +104,7 @@ __attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *La /* As we have now possibly more than one LanguageCode this method is supersided by a) private classmembers or b) getLanguages(). TODO: Remove method with next API break */ -__attribute__ ((deprecated)) std::string pkgIndexFile::LanguageCode() { +APT_DEPRECATED std::string pkgIndexFile::LanguageCode() { if (TranslationsAvailable() == false) return ""; return APT::Configuration::getLanguages()[0]; diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 9a5c74200..98cdda603 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -22,18 +22,21 @@ #ifndef PKGLIB_INDEXFILE_H #define PKGLIB_INDEXFILE_H - -#include <string> -#include <apt-pkg/pkgcache.h> #include <apt-pkg/srcrecords.h> #include <apt-pkg/pkgrecords.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/macros.h> +#include <string> + #ifndef APT_8_CLEANER_HEADERS using std::string; #endif - +#ifndef APT_10_CLEANER_HEADERS class pkgAcquire; +#endif + class pkgCacheGenerator; class OpProgress; @@ -79,10 +82,10 @@ class pkgIndexFile virtual bool HasPackages() const = 0; virtual unsigned long Size() const = 0; virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* /*Prog*/) const { return false; }; - __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const + APT_DEPRECATED virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const { return Merge(Gen, &Prog); }; virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;}; - __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const + APT_DEPRECATED virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const {return MergeFileProvides(Gen, &Prog);}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index c1c397e31..1123d1690 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -14,8 +14,13 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/gpgv.h> -#include <sys/stat.h> +#include <stdlib.h> +#include <time.h> #include <clocale> +#include <map> +#include <string> +#include <utility> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index d003ec0fa..e31f889ad 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -5,17 +5,19 @@ #ifndef PKGLIB_INDEXRECORDS_H #define PKGLIB_INDEXRECORDS_H - -#include <apt-pkg/pkgcache.h> #include <apt-pkg/hashes.h> #include <map> #include <vector> #include <ctime> +#include <string> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/fileutl.h> #endif +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/pkgcache.h> +#endif class indexRecords { diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 6ab5ec42d..3a35f852e 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -15,9 +15,11 @@ #include <apt-pkg/error.h> #include <apt-pkg/pkgsystem.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/macros.h> +#include <string.h> +#include <string> #include <cstdlib> -#include <sys/stat.h> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 4ee7a95ac..d062392e3 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -16,7 +16,9 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/pkgsystem.h> #endif +#ifndef APT_10_CLEANER_HEADERS #include <apt-pkg/macros.h> +#endif class pkgSystem; class Configuration; diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index 657330b60..6f43e0bc0 100644 --- a/apt-pkg/install-progress.cc +++ b/apt-pkg/install-progress.cc @@ -1,17 +1,23 @@ +#include <config.h> + #include <apt-pkg/configuration.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/strutl.h> #include <apt-pkg/install-progress.h> -#include <apti18n.h> - -#include <termios.h> +#include <signal.h> +#include <unistd.h> +#include <iostream> +#include <string> +#include <vector> #include <sys/ioctl.h> #include <sstream> #include <fcntl.h> #include <algorithm> #include <stdio.h> +#include <apti18n.h> + namespace APT { namespace Progress { @@ -329,15 +335,15 @@ bool PackageManagerFancy::StatusChanged(std::string PackageName, int row = GetNumberTerminalRows(); - static string save_cursor = "\033[s"; - static string restore_cursor = "\033[u"; - - static string set_bg_color = "\033[42m"; // green - static string set_fg_color = "\033[30m"; // black - - static string restore_bg = "\033[49m"; - static string restore_fg = "\033[39m"; - + static std::string save_cursor = "\033[s"; + static std::string restore_cursor = "\033[u"; + + static std::string set_bg_color = "\033[42m"; // green + static std::string set_fg_color = "\033[30m"; // black + + static std::string restore_bg = "\033[49m"; + static std::string restore_fg = "\033[39m"; + std::cout << save_cursor // move cursor position to last row << "\033[" << row << ";0f" diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 18a90a29d..ffabaadbf 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -1,12 +1,19 @@ #ifndef PKGLIB_METAINDEX_H #define PKGLIB_METAINDEX_H - -#include <string> -#include <apt-pkg/pkgcache.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/init.h> +#include <stddef.h> + +#include <string> +#include <vector> + +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/pkgcache.h> +class pkgCacheGenerator; +class OpProgress; +#endif #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/srcrecords.h> #include <apt-pkg/pkgrecords.h> @@ -15,8 +22,6 @@ using std::string; #endif class pkgAcquire; -class pkgCacheGenerator; -class OpProgress; class metaIndex { diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 21b5fc4e7..a1fcbcc98 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -68,10 +68,14 @@ #include <apt-pkg/orderlist.h> #include <apt-pkg/depcache.h> #include <apt-pkg/error.h> -#include <apt-pkg/version.h> #include <apt-pkg/sptr.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgcache.h> +#include <stdlib.h> +#include <string.h> +#include <string> #include <iostream> /*}}}*/ diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h index a2d7b321b..1fdfbf559 100644 --- a/apt-pkg/orderlist.h +++ b/apt-pkg/orderlist.h @@ -16,10 +16,12 @@ #ifndef PKGLIB_ORDERLIST_H #define PKGLIB_ORDERLIST_H - #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/macros.h> +#include <string> + class pkgDepCache; class pkgOrderList : protected pkgCache::Namespace { @@ -46,7 +48,7 @@ class pkgOrderList : protected pkgCache::Namespace bool Debug; // Main visit function - __deprecated bool VisitNode(PkgIterator Pkg) { return VisitNode(Pkg, "UNKNOWN"); }; + APT_DEPRECATED bool VisitNode(PkgIterator Pkg) { return VisitNode(Pkg, "UNKNOWN"); }; bool VisitNode(PkgIterator Pkg, char const* from); bool VisitDeps(DepFunc F,PkgIterator Pkg); bool VisitRDeps(DepFunc F,PkgIterator Pkg); diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 0be76b311..4d08fb3ba 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -13,7 +13,7 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include<config.h> +#include <config.h> #include <apt-pkg/packagemanager.h> #include <apt-pkg/orderlist.h> @@ -24,7 +24,14 @@ #include <apt-pkg/algorithms.h> #include <apt-pkg/configuration.h> #include <apt-pkg/sptr.h> - +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/strutl.h> + +#include <stddef.h> +#include <list> +#include <string> #include <iostream> #include <apti18n.h> diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index d684463eb..a86b176a4 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -23,15 +23,17 @@ #ifndef PKGLIB_PACKAGEMANAGER_H #define PKGLIB_PACKAGEMANAGER_H -#include <apt-pkg/macros.h> #include <apt-pkg/pkgcache.h> -#include <apt-pkg/install-progress.h> #include <apt-pkg/init.h> +#include <apt-pkg/macros.h> #include <string> -#include <iostream> #include <set> +#ifndef APT_10_CLEANER_HEADERS +#include <apt-pkg/install-progress.h> +#include <iostream> +#endif #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/depcache.h> using std::string; @@ -109,7 +111,7 @@ class pkgPackageManager : protected pkgCache::Namespace #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) OrderResult DoInstall(APT::Progress::PackageManager *progress); // compat - __deprecated OrderResult DoInstall(int statusFd=-1); + APT_DEPRECATED OrderResult DoInstall(int statusFd=-1); #else OrderResult DoInstall(int statusFd=-1); #endif @@ -124,7 +126,7 @@ class pkgPackageManager : protected pkgCache::Namespace // stuff that needs to be done after the fork OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress); // compat - __deprecated OrderResult DoInstallPostFork(int statusFd=-1); + APT_DEPRECATED OrderResult DoInstallPostFork(int statusFd=-1); #else OrderResult DoInstallPostFork(int statusFd=-1); #endif diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 9c14e626e..a19b9571c 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -29,12 +29,15 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> #include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/mmap.h> #include <apt-pkg/macros.h> +#include <stddef.h> +#include <string.h> +#include <ostream> +#include <vector> #include <string> #include <sys/stat.h> -#include <unistd.h> -#include <ctype.h> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 185b9ca45..525f1dfb4 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -18,20 +18,26 @@ #include <apt-pkg/progress.h> #include <apt-pkg/sourcelist.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/aptconfiguration.h> #include <apt-pkg/strutl.h> #include <apt-pkg/sptr.h> #include <apt-pkg/pkgsystem.h> #include <apt-pkg/macros.h> -#include <apt-pkg/tagfile.h> #include <apt-pkg/metaindex.h> #include <apt-pkg/fileutl.h> - +#include <apt-pkg/hashsum_template.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/md5.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <stddef.h> +#include <string.h> +#include <iostream> +#include <string> #include <vector> #include <sys/stat.h> #include <unistd.h> -#include <errno.h> -#include <stdio.h> #include <apti18n.h> /*}}}*/ @@ -1333,7 +1339,7 @@ DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long the cache will be stored there. This is pretty much mandetory if you are using AllowMem. AllowMem lets the function be run as non-root where it builds the cache 'fast' into a memory buffer. */ -__deprecated bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, +APT_DEPRECATED bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap, bool AllowMem) { return pkgCacheGenerator::MakeStatusCache(List, &Progress, OutMap, AllowMem); } bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress, @@ -1534,7 +1540,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress // CacheGenerator::MakeOnlyStatusCache - Build only a status files cache/*{{{*/ // --------------------------------------------------------------------- /* */ -__deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) +APT_DEPRECATED bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); } bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap) { diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index e8901025e..9ccf71c7b 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -19,16 +19,18 @@ #ifndef PKGLIB_PKGCACHEGEN_H #define PKGLIB_PKGCACHEGEN_H - -#include <apt-pkg/pkgcache.h> #include <apt-pkg/md5.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/macros.h> #include <vector> +#include <string> +class FileFd; class pkgSourceList; class OpProgress; -class MMap; class pkgIndexFile; class pkgCacheGenerator /*{{{*/ @@ -80,7 +82,7 @@ class pkgCacheGenerator /*{{{*/ bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, map_ptrloc const Version, unsigned int const &Op, unsigned int const &Type, map_ptrloc* &OldDepLast); - __deprecated unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next) + unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next) APT_DEPRECATED { return NewVersion(Ver, VerStr, 0, 0, Next); } unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr, map_ptrloc const ParentPkg, unsigned long const Hash, @@ -102,7 +104,7 @@ class pkgCacheGenerator /*{{{*/ bool HasFileDeps() {return FoundFileDeps;}; bool MergeFileProvides(ListParser &List); - __deprecated bool FinishCache(OpProgress *Progress); + bool FinishCache(OpProgress *Progress) APT_DEPRECATED; static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap = 0,bool AllowMem = false); diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index 36dab3480..c403e4dc3 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -14,7 +14,11 @@ #include <apt-pkg/pkgrecords.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/error.h> -#include <apt-pkg/configuration.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <stddef.h> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index ca0984bbf..b5237b3a0 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -17,8 +17,9 @@ #ifndef PKGLIB_PKGRECORDS_H #define PKGLIB_PKGRECORDS_H - #include <apt-pkg/pkgcache.h> + +#include <string> #include <vector> class pkgRecords /*{{{*/ diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc index 05ba6e0e6..ee6c3f4ec 100644 --- a/apt-pkg/pkgsystem.cc +++ b/apt-pkg/pkgsystem.cc @@ -13,7 +13,6 @@ #include<config.h> #include <apt-pkg/pkgsystem.h> -#include <apt-pkg/policy.h> #include <cassert> #include <cstring> /*}}}*/ diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index eb75df412..6e33c67ed 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -38,6 +38,7 @@ #define PKGLIB_PKGSYSTEM_H #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <vector> @@ -50,7 +51,6 @@ class pkgPackageManager; class pkgVersioningSystem; class Configuration; class pkgIndexFile; -class PkgFileIterator; class pkgSystem { diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 2176f1f42..ae30b6f50 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -33,7 +33,15 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> - +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/versionmatch.h> + +#include <ctype.h> +#include <stddef.h> +#include <string.h> +#include <string> +#include <vector> #include <iostream> #include <sstream> diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 5172a3c3b..f15d8c0a0 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -33,10 +33,13 @@ #ifndef PKGLIB_POLICY_H #define PKGLIB_POLICY_H - #include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/versionmatch.h> + #include <vector> +#include <string> #ifndef APT_8_CLEANER_HEADERS using std::vector; diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 1f5179885..e37899ec6 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -18,7 +18,16 @@ #include <apt-pkg/metaindex.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/tagfile.h> - +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <ctype.h> +#include <stddef.h> +#include <time.h> +#include <cstring> +#include <map> +#include <string> +#include <vector> #include <fstream> #include <algorithm> diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 0ccb4aa00..af7569375 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -27,18 +27,26 @@ #ifndef PKGLIB_SOURCELIST_H #define PKGLIB_SOURCELIST_H +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <time.h> + #include <string> #include <vector> #include <map> -#include <apt-pkg/pkgcache.h> -#include <apt-pkg/tagfile.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/tagfile.h> +#endif #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/metaindex.h> using std::string; using std::vector; #endif +class FileFd; +class pkgTagSection; class pkgAcquire; class pkgIndexFile; class metaIndex; diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 60b62850a..775cf2e5f 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -16,8 +16,13 @@ #include <apt-pkg/srcrecords.h> #include <apt-pkg/error.h> #include <apt-pkg/sourcelist.h> -#include <apt-pkg/strutl.h> #include <apt-pkg/metaindex.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/macros.h> + +#include <string.h> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index e1459c80e..906321456 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -21,6 +21,8 @@ #include <string> #include <stdio.h> #include <ctype.h> +#include <stdlib.h> +#include <string.h> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/update.cc b/apt-pkg/update.cc index 97be5490b..5d5b19626 100644 --- a/apt-pkg/update.cc +++ b/apt-pkg/update.cc @@ -1,24 +1,17 @@ - // Include Files /*{{{*/ #include <config.h> -#include <apt-pkg/algorithms.h> -#include <apt-pkg/update.h> -#include <apt-pkg/error.h> -#include <apt-pkg/configuration.h> -#include <apt-pkg/version.h> -#include <apt-pkg/sptr.h> #include <apt-pkg/acquire-item.h> -#include <apt-pkg/edsp.h> -#include <apt-pkg/sourcelist.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/progress.h> +#include <apt-pkg/sourcelist.h> +#include <apt-pkg/acquire.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/update.h> -#include <sys/types.h> -#include <cstdlib> -#include <algorithm> -#include <iostream> -#include <stdio.h> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index d6f6933dd..7926845c2 100644 --- a/apt-pkg/upgrade.cc +++ b/apt-pkg/upgrade.cc @@ -1,24 +1,17 @@ - // Include Files /*{{{*/ #include <config.h> #include <apt-pkg/algorithms.h> -#include <apt-pkg/upgrade.h> -#include <apt-pkg/error.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/version.h> -#include <apt-pkg/sptr.h> -#include <apt-pkg/acquire-item.h> #include <apt-pkg/edsp.h> -#include <apt-pkg/sourcelist.h> -#include <apt-pkg/fileutl.h> +#include <apt-pkg/error.h> #include <apt-pkg/progress.h> +#include <apt-pkg/upgrade.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> -#include <sys/types.h> -#include <cstdlib> -#include <algorithm> -#include <iostream> -#include <stdio.h> +#include <string> #include <apti18n.h> /*}}}*/ diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h index 436d38300..aa883df10 100644 --- a/apt-pkg/upgrade.h +++ b/apt-pkg/upgrade.h @@ -10,6 +10,8 @@ #ifndef PKGLIB_UPGRADE_H #define PKGLIB_UPGRADE_H +class pkgDepCache; + namespace APT { namespace Upgrade { // FIXME: make this "enum class UpgradeMode {" once we enable c++11 diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc index f19534171..986636e97 100644 --- a/apt-pkg/vendor.cc +++ b/apt-pkg/vendor.cc @@ -1,10 +1,14 @@ #include<config.h> -#include <iostream> -#include <apt-pkg/error.h> #include <apt-pkg/vendor.h> #include <apt-pkg/configuration.h> +#include <iostream> +#include <map> +#include <string> +#include <utility> +#include <vector> + Vendor::Vendor(std::string VendorID, std::string Origin, std::vector<struct Vendor::Fingerprint *> *FingerprintList) diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h index 6484adf9b..2d2e2b0ae 100644 --- a/apt-pkg/vendor.h +++ b/apt-pkg/vendor.h @@ -11,7 +11,7 @@ using std::string; #endif // A class representing a particular software provider. -class __deprecated Vendor +class APT_DEPRECATED Vendor { public: struct Fingerprint diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc index 602425624..fb33ff17d 100644 --- a/apt-pkg/vendorlist.cc +++ b/apt-pkg/vendorlist.cc @@ -3,9 +3,16 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/error.h> #include <apt-pkg/configuration.h> + +#include <stddef.h> +#include <iostream> +#include <string> +#include <vector> + #include <apti18n.h> #if __GNUC__ >= 4 + #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif @@ -157,5 +164,5 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput) /* /*}}}*/ #if __GNUC__ >= 4 - #pragma GCC diagnostic warning "-Wdeprecated-declarations" + #pragma GCC diagnostic pop #endif diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index a86ccde7c..bc3702a93 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -27,7 +27,7 @@ using std::vector; class Vendor; class Configuration; -class __deprecated pkgVendorList +class APT_DEPRECATED pkgVendorList { protected: std::vector<Vendor const *> VendorList; diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc index cb2c34c0f..29bee46da 100644 --- a/apt-pkg/version.cc +++ b/apt-pkg/version.cc @@ -11,8 +11,8 @@ #include<config.h> #include <apt-pkg/version.h> -#include <apt-pkg/pkgcache.h> +#include <string.h> #include <stdlib.h> /*}}}*/ diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 26262a010..284098bdf 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -16,11 +16,16 @@ #include <apt-pkg/versionmatch.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <string> #include <stdio.h> #include <ctype.h> #include <fnmatch.h> -#include <sys/types.h> #include <regex.h> /*}}}*/ diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index 433396fc9..a889878ad 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -35,9 +35,10 @@ #ifndef PKGLIB_VERSIONMATCH_H #define PKGLIB_VERSIONMATCH_H +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <string> -#include <apt-pkg/pkgcache.h> #ifndef APT_8_CLEANER_HEADERS using std::string; diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index d08ed072f..fe7a45e12 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -10,18 +10,21 @@ // Include files /*{{{*/ #include<config.h> +#include <apt-pkg/acquire.h> #include <apt-pkg/acquire-item.h> #include <apt-pkg/acquire-worker.h> #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> +#include <apt-private/acqprogress.h> + +#include <string.h> #include <stdio.h> #include <signal.h> #include <iostream> #include <unistd.h> -#include "acqprogress.h" #include <apti18n.h> /*}}}*/ diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc index c822b9bad..5e955ac39 100644 --- a/apt-private/private-cachefile.cc +++ b/apt-private/private-cachefile.cc @@ -4,11 +4,17 @@ #include <apt-pkg/algorithms.h> #include <apt-pkg/upgrade.h> #include <apt-pkg/error.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> -#include <cstdlib> +#include <apt-private/private-output.h> +#include <apt-private/private-cachefile.h> -#include "private-output.h" -#include "private-cachefile.h" +#include <string.h> +#include <ostream> +#include <cstdlib> #include <apti18n.h> /*}}}*/ diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h index f24d93020..94d93df2c 100644 --- a/apt-private/private-cachefile.h +++ b/apt-private/private-cachefile.h @@ -3,6 +3,8 @@ #include <apt-pkg/cachefile.h> #include <apt-pkg/progress.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/pkgcache.h> // class CacheFile - Cover class for some dependency cache functions /*{{{*/ diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc index a7dc0e800..4a63c7e81 100644 --- a/apt-private/private-cacheset.cc +++ b/apt-private/private-cacheset.cc @@ -1,9 +1,18 @@ +#include <config.h> + #include <apt-pkg/cachefile.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/depcache.h> -#include <apt-pkg/strutl.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/progress.h> +#include <apt-pkg/policy.h> + +#include <apt-private/private-cacheset.h> + +#include <stddef.h> -#include "private-cacheset.h" +#include <apti18n.h> bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, LocalitySortedVersionSet &output_set, diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h index 26c7f1ac2..854d16922 100644 --- a/apt-private/private-cacheset.h +++ b/apt-private/private-cacheset.h @@ -1,17 +1,32 @@ #ifndef APT_PRIVATE_CACHESET_H #define APT_PRIVATE_CACHESET_H +#include <apt-pkg/aptconfiguration.h> #include <apt-pkg/cachefile.h> #include <apt-pkg/cacheset.h> #include <apt-pkg/sptr.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/error.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/macros.h> #include <algorithm> #include <vector> +#include <string.h> +#include <list> +#include <ostream> +#include <set> +#include <string> +#include <utility> #include "private-output.h" #include <apti18n.h> +class OpProgress; + struct VersionSortDescriptionLocality { bool operator () (const pkgCache::VerIterator &v_lhs, diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 132da04d5..2b2a35637 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -2,15 +2,13 @@ #include <config.h> #include <apt-pkg/cmndline.h> -#include <apt-pkg/configuration.h> -#include <vector> +#include <apt-private/private-cmndline.h> +#include <vector> #include <stdarg.h> #include <string.h> -#include "private-cmndline.h" - #include <apti18n.h> /*}}}*/ diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index 80795f964..a095f0c67 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -7,10 +7,8 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> -#include "private-output.h" -#include "private-download.h" - -#include <locale.h> +#include <apt-private/private-output.h> +#include <apt-private/private-download.h> #include <fstream> #include <string> diff --git a/apt-private/private-download.h b/apt-private/private-download.h index b8cc8da1e..1447845ed 100644 --- a/apt-private/private-download.h +++ b/apt-private/private-download.h @@ -1,7 +1,7 @@ #ifndef APT_PRIVATE_DOWNLOAD_H #define APT_PRIVATE_DOWNLOAD_H -#include <apt-pkg/acquire.h> +class pkgAcquire; bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser); bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure); diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index ff609f567..8092af939 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -1,57 +1,45 @@ // Include Files /*{{{*/ #include <config.h> -#include <apt-pkg/aptconfiguration.h> -#include <apt-pkg/error.h> -#include <apt-pkg/cmndline.h> -#include <apt-pkg/init.h> -#include <apt-pkg/depcache.h> -#include <apt-pkg/sourcelist.h> -#include <apt-pkg/algorithms.h> +#include <apt-pkg/acquire.h> #include <apt-pkg/acquire-item.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> -#include <apt-pkg/clean.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> +#include <apt-pkg/algorithms.h> #include <apt-pkg/cachefile.h> #include <apt-pkg/cacheset.h> -#include <apt-pkg/sptr.h> -#include <apt-pkg/md5.h> -#include <apt-pkg/versionmatch.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/pkgsystem.h> +#include <apt-pkg/cmndline.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> #include <apt-pkg/pkgrecords.h> -#include <apt-pkg/indexfile.h> -#include <apt-pkg/install-progress.h> -#include <apt-pkg/init.h> +#include <apt-pkg/pkgsystem.h> +#include <apt-pkg/sptr.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/packagemanager.h> +#include <apt-pkg/pkgcache.h> -#include <set> -#include <locale.h> -#include <langinfo.h> -#include <fstream> -#include <termios.h> -#include <sys/ioctl.h> -#include <sys/stat.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> #include <sys/statfs.h> #include <sys/statvfs.h> -#include <signal.h> -#include <unistd.h> -#include <stdio.h> -#include <errno.h> -#include <regex.h> -#include <sys/wait.h> -#include <sstream> +#include <algorithm> +#include <iostream> +#include <set> +#include <vector> -#include "private-install.h" -#include "private-download.h" -#include "private-cachefile.h" -#include "private-output.h" -#include "private-cacheset.h" -#include "acqprogress.h" +#include <apt-private/acqprogress.h> +#include <apt-private/private-install.h> +#include <apt-private/private-cachefile.h> +#include <apt-private/private-cacheset.h> +#include <apt-private/private-download.h> +#include <apt-private/private-output.h> #include <apti18n.h> /*}}}*/ +class pkgSourceList; // InstallPackages - Actually download and install the packages /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-private/private-install.h b/apt-private/private-install.h index 2187146d3..79769d470 100644 --- a/apt-private/private-install.h +++ b/apt-private/private-install.h @@ -1,15 +1,29 @@ #ifndef APT_PRIVATE_INSTALL_H #define APT_PRIVATE_INSTALL_H +#include <apt-pkg/cachefile.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/cacheset.h> -#include <apt-pkg/cmndline.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/algorithms.h> + +#include <stddef.h> +#include <iosfwd> +#include <list> +#include <map> +#include <string> +#include <utility> -#include "private-cachefile.h" #include "private-output.h" #include <apti18n.h> +class CacheFile; +class CommandLine; + #define RAMFS_MAGIC 0x858458f6 bool DoInstall(CommandLine &Cmd); diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index bc4539aeb..7664ca134 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -1,43 +1,28 @@ // Include Files /*{{{*/ #include <config.h> -#include <apt-pkg/error.h> #include <apt-pkg/cachefile.h> #include <apt-pkg/cachefilter.h> #include <apt-pkg/cacheset.h> -#include <apt-pkg/init.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/sourcelist.h> #include <apt-pkg/cmndline.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> #include <apt-pkg/pkgrecords.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> -#include <apt-pkg/policy.h> -#include <apt-pkg/tagfile.h> -#include <apt-pkg/algorithms.h> -#include <apt-pkg/sptr.h> -#include <apt-pkg/pkgsystem.h> -#include <apt-pkg/indexfile.h> -#include <apt-pkg/metaindex.h> +#include <apt-pkg/progress.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <apt-private/private-cacheset.h> +#include <apt-private/private-list.h> +#include <apt-private/private-output.h> +#include <iostream> #include <sstream> -#include <vector> +#include <map> +#include <string> #include <utility> -#include <cassert> -#include <locale.h> -#include <iostream> -#include <unistd.h> -#include <errno.h> -#include <regex.h> -#include <stdio.h> -#include <algorithm> - -#include "private-cmndline.h" -#include "private-list.h" -#include "private-output.h" -#include "private-cacheset.h" +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/apt-private/private-list.h b/apt-private/private-list.h index 6f5aad27a..749744dd1 100644 --- a/apt-private/private-list.h +++ b/apt-private/private-list.h @@ -1,7 +1,7 @@ #ifndef APT_PRIVATE_LIST_H #define APT_PRIVATE_LIST_H -#include <apt-pkg/cmndline.h> +class CommandLine; bool List(CommandLine &Cmd); diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc index 1fdf3f0be..2d3965172 100644 --- a/apt-private/private-main.cc +++ b/apt-private/private-main.cc @@ -1,9 +1,13 @@ +#include <config.h> -#include<unistd.h> -#include<cstring> - +#include <apt-pkg/cmndline.h> #include <apt-pkg/configuration.h> -#include "private-main.h" + +#include <apt-private/private-main.h> + +#include <iostream> +#include <string.h> +#include <unistd.h> #include <apti18n.h> diff --git a/apt-private/private-main.h b/apt-private/private-main.h index f9a95c4ec..257c51a0b 100644 --- a/apt-private/private-main.h +++ b/apt-private/private-main.h @@ -1,9 +1,8 @@ #ifndef APT_PRIVATE_MAIN_H #define APT_PRIVATE_MAIN_H -#include <apt-pkg/cmndline.h> +class CommandLine; void CheckSimulateMode(CommandLine &CmdL); - #endif diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc index 9c4f6bf15..a87999150 100644 --- a/apt-private/private-moo.cc +++ b/apt-private/private-moo.cc @@ -13,11 +13,15 @@ #include <apt-pkg/cmndline.h> #include <apt-pkg/strutl.h> -#include <strings.h> -#include <sstream> +#include <apt-private/private-moo.h> +#include <apt-private/private-output.h> -#include "private-moo.h" -#include "private-output.h" +#include <stddef.h> +#include <string.h> +#include <time.h> +#include <iostream> +#include <sstream> +#include <string> #include <apti18n.h> /*}}}*/ diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 52f65d794..bbd8545ad 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -7,16 +7,22 @@ #include <apt-pkg/cachefile.h> #include <apt-pkg/pkgrecords.h> #include <apt-pkg/policy.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-private/private-output.h> +#include <apt-private/private-cachefile.h> + +#include <regex.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <iomanip> #include <iostream> -#include <locale.h> #include <langinfo.h> #include <unistd.h> -#include "private-output.h" -#include "private-cachefile.h" - #include <apti18n.h> /*}}}*/ diff --git a/apt-private/private-output.h b/apt-private/private-output.h index 2a2a69458..81643f90a 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -1,17 +1,14 @@ #ifndef APT_PRIVATE_OUTPUT_H #define APT_PRIVATE_OUTPUT_H +#include <apt-pkg/pkgcache.h> -#include <iostream> #include <fstream> #include <string> -#include "private-cachefile.h" - // forward declaration class pkgCacheFile; class CacheFile; -class pkgCache; class pkgDepCache; class pkgRecords; diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc index 0b1a929b0..8106333b6 100644 --- a/apt-private/private-search.cc +++ b/apt-private/private-search.cc @@ -1,40 +1,30 @@ // Includes /*{{{*/ -#include <apt-pkg/error.h> +#include <config.h> + #include <apt-pkg/cachefile.h> -#include <apt-pkg/cachefilter.h> #include <apt-pkg/cacheset.h> -#include <apt-pkg/init.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/sourcelist.h> #include <apt-pkg/cmndline.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> #include <apt-pkg/pkgrecords.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> #include <apt-pkg/policy.h> -#include <apt-pkg/tagfile.h> -#include <apt-pkg/algorithms.h> -#include <apt-pkg/sptr.h> -#include <apt-pkg/pkgsystem.h> -#include <apt-pkg/indexfile.h> -#include <apt-pkg/metaindex.h> +#include <apt-pkg/progress.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> -#include <sstream> -#include <utility> -#include <cassert> -#include <locale.h> +#include <apt-private/private-cacheset.h> +#include <apt-private/private-output.h> +#include <apt-private/private-search.h> + +#include <string.h> #include <iostream> -#include <unistd.h> -#include <errno.h> -#include <regex.h> -#include <stdio.h> -#include <iomanip> -#include <algorithm> +#include <sstream> #include <map> +#include <string> +#include <utility> -#include "private-search.h" -#include "private-cacheset.h" +#include <apti18n.h> /*}}}*/ bool FullTextSearch(CommandLine &CmdL) /*{{{*/ diff --git a/apt-private/private-search.h b/apt-private/private-search.h index 17faffebc..539915f1f 100644 --- a/apt-private/private-search.h +++ b/apt-private/private-search.h @@ -1,7 +1,7 @@ #ifndef APT_PRIVATE_SEARCH_H #define APT_PRIVATE_SEARCH_H -#include <apt-pkg/cmndline.h> +class CommandLine; bool FullTextSearch(CommandLine &CmdL); diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 94f944af1..8ae6a6dac 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -1,30 +1,32 @@ // Includes /*{{{*/ -#include <apt-pkg/error.h> +#include <config.h> + #include <apt-pkg/cachefile.h> -#include <apt-pkg/cachefilter.h> #include <apt-pkg/cacheset.h> -#include <apt-pkg/init.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/sourcelist.h> #include <apt-pkg/cmndline.h> -#include <apt-pkg/strutl.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/indexfile.h> #include <apt-pkg/pkgrecords.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> -#include <apt-pkg/policy.h> -#include <apt-pkg/tagfile.h> -#include <apt-pkg/algorithms.h> -#include <apt-pkg/sptr.h> #include <apt-pkg/pkgsystem.h> -#include <apt-pkg/indexfile.h> -#include <apt-pkg/metaindex.h> +#include <apt-pkg/sourcelist.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/tagfile.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> -#include <apti18n.h> +#include <apt-private/private-cacheset.h> +#include <apt-private/private-output.h> +#include <apt-private/private-show.h> + +#include <stdio.h> +#include <ostream> +#include <string> -#include "private-output.h" -#include "private-cacheset.h" -#include "private-show.h" +#include <apti18n.h> /*}}}*/ namespace APT { @@ -33,7 +35,7 @@ namespace APT { // DisplayRecord - Displays the complete record for the package /*{{{*/ // --------------------------------------------------------------------- static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, - ostream &out) + std::ostream &out) { pkgCache *Cache = CacheFile.GetPkgCache(); if (unlikely(Cache == NULL)) diff --git a/apt-private/private-show.h b/apt-private/private-show.h index b428c7af0..a15367e28 100644 --- a/apt-private/private-show.h +++ b/apt-private/private-show.h @@ -1,7 +1,7 @@ #ifndef APT_PRIVATE_SHOW_H #define APT_PRIVATE_SHOW_H -#include <apt-pkg/cmndline.h> +class CommandLine; namespace APT { namespace Cmd { diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc index 41cf6b313..301936b9d 100644 --- a/apt-private/private-sources.cc +++ b/apt-private/private-sources.cc @@ -1,10 +1,23 @@ +#include <config.h> #include <apt-pkg/hashes.h> -#include <apti18n.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/sourcelist.h> +#include <apt-pkg/cmndline.h> +#include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> + +#include <apt-private/private-output.h> +#include <apt-private/private-sources.h> +#include <apt-private/private-utils.h> -#include "private-output.h" -#include "private-sources.h" -#include "private-utils.h" +#include <stddef.h> +#include <unistd.h> +#include <iostream> +#include <string> + +#include <apti18n.h> /* Interface discussion with donkult (for the future): apt [add-{archive,release,component}|edit|change-release|disable]-sources diff --git a/apt-private/private-sources.h b/apt-private/private-sources.h index b394622be..4c58af180 100644 --- a/apt-private/private-sources.h +++ b/apt-private/private-sources.h @@ -1,3 +1,8 @@ -#include <apt-pkg/cmndline.h> +#ifndef APT_PRIVATE_SOURCES_H +#define APT_PRIVATE_SOURCES_H + +class CommandLine; bool EditSources(CommandLine &CmdL); + +#endif diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc index 1f6fb6f79..da83d7741 100644 --- a/apt-private/private-update.cc +++ b/apt-private/private-update.cc @@ -1,38 +1,23 @@ // Include files /*{{{*/ #include<config.h> -#include <apt-pkg/aptconfiguration.h> -#include <apt-pkg/error.h> -#include <apt-pkg/cmndline.h> -#include <apt-pkg/init.h> -#include <apt-pkg/depcache.h> -#include <apt-pkg/sourcelist.h> -#include <apt-pkg/algorithms.h> #include <apt-pkg/acquire-item.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> -#include <apt-pkg/clean.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> #include <apt-pkg/cachefile.h> -#include <apt-pkg/cacheset.h> -#include <apt-pkg/sptr.h> -#include <apt-pkg/md5.h> -#include <apt-pkg/versionmatch.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/pkgsystem.h> -#include <apt-pkg/pkgrecords.h> -#include <apt-pkg/indexfile.h> +#include <apt-pkg/cmndline.h> +#include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/sourcelist.h> #include <apt-pkg/update.h> +#include <apt-pkg/acquire.h> +#include <apt-pkg/configuration.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> +#include <apt-private/acqprogress.h> +#include <apt-private/private-cachefile.h> +#include <apt-private/private-output.h> +#include <apt-private/private-update.h> -#include "private-cachefile.h" -#include "private-output.h" -#include "private-update.h" -#include "acqprogress.h" +#include <ostream> +#include <string> #include <apti18n.h> /*}}}*/ diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc index a97e6d25b..68b2c5e00 100644 --- a/apt-private/private-upgrade.cc +++ b/apt-private/private-upgrade.cc @@ -1,12 +1,18 @@ - // Includes /*{{{*/ -#include <apt-pkg/algorithms.h> +#include <config.h> + #include <apt-pkg/upgrade.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> + +#include <apt-private/private-install.h> +#include <apt-private/private-cachefile.h> +#include <apt-private/private-upgrade.h> +#include <apt-private/private-output.h> + #include <iostream> -#include "private-install.h" -#include "private-cachefile.h" -#include "private-upgrade.h" -#include "private-output.h" + +#include <apti18n.h> /*}}}*/ // this is actually performing the various upgrade operations diff --git a/apt-private/private-upgrade.h b/apt-private/private-upgrade.h index 5efc66bf7..64c4c0874 100644 --- a/apt-private/private-upgrade.h +++ b/apt-private/private-upgrade.h @@ -1,13 +1,11 @@ #ifndef APTPRIVATE_PRIVATE_UPGRADE_H #define APTPRIVATE_PRIVATE_UPGRADE_H -#include <apt-pkg/cmndline.h> - +class CommandLine; bool DoDistUpgrade(CommandLine &CmdL); bool DoUpgrade(CommandLine &CmdL); bool DoUpgradeNoNewPackages(CommandLine &CmdL); bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL); - #endif diff --git a/apt-private/private-utils.cc b/apt-private/private-utils.cc index 813f19329..9547a1b75 100644 --- a/apt-private/private-utils.cc +++ b/apt-private/private-utils.cc @@ -1,9 +1,12 @@ -#include <cstdlib> +#include <config.h> #include <apt-pkg/configuration.h> #include <apt-pkg/fileutl.h> -#include "private-utils.h" +#include <apt-private/private-utils.h> + +#include <cstdlib> +#include <unistd.h> // DisplayFileInPager - Display File with pager /*{{{*/ void DisplayFileInPager(std::string filename) @@ -26,7 +29,6 @@ void DisplayFileInPager(std::string filename) ExecWait(Process, "sensible-pager", false); } /*}}}*/ - // EditFileInSensibleEditor - Edit File with editor /*{{{*/ void EditFileInSensibleEditor(std::string filename) { diff --git a/apt-private/private-utils.h b/apt-private/private-utils.h index 258dd06a8..4bb535e86 100644 --- a/apt-private/private-utils.h +++ b/apt-private/private-utils.h @@ -6,6 +6,4 @@ void DisplayFileInPager(std::string filename); void EditFileInSensibleEditor(std::string filename); - - #endif diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index a9d48dd97..2202c5b19 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -8,7 +8,8 @@ #ifdef USE_NLS // apt will use the gettext implementation of the C library -# include <libintl.h> +#include <libintl.h> +#include <locale.h> # ifdef APT_DOMAIN # define _(x) dgettext(APT_DOMAIN,x) # define P_(msg,plural,n) dngettext(APT_DOMAIN,msg,plural,n) diff --git a/buildlib/config.h.in b/buildlib/config.h.in index bd43a40b9..6779e07bc 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -42,3 +42,4 @@ #define APT_8_CLEANER_HEADERS #define APT_9_CLEANER_HEADERS +#define APT_10_CLEANER_HEADERS diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index 3ac350aca..c362c1edf 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -10,12 +10,14 @@ // Include files /*{{{*/ #include<config.h> +#include <apt-pkg/acquire.h> #include <apt-pkg/acquire-item.h> #include <apt-pkg/acquire-worker.h> #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> +#include <string.h> #include <stdio.h> #include <signal.h> #include <iostream> diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index d50e0c724..0860ee7bf 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -15,40 +15,49 @@ // Include Files /*{{{*/ #include<config.h> -#include <apt-pkg/error.h> +#include <apt-pkg/algorithms.h> #include <apt-pkg/cachefile.h> #include <apt-pkg/cacheset.h> -#include <apt-pkg/init.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/sourcelist.h> #include <apt-pkg/cmndline.h> -#include <apt-pkg/strutl.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/init.h> +#include <apt-pkg/metaindex.h> #include <apt-pkg/pkgrecords.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> +#include <apt-pkg/pkgsystem.h> #include <apt-pkg/policy.h> -#include <apt-pkg/tagfile.h> -#include <apt-pkg/algorithms.h> +#include <apt-pkg/progress.h> +#include <apt-pkg/sourcelist.h> #include <apt-pkg/sptr.h> -#include <apt-pkg/pkgsystem.h> -#include <apt-pkg/indexfile.h> -#include <apt-pkg/metaindex.h> +#include <apt-pkg/srcrecords.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/tagfile.h> +#include <apt-pkg/version.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/pkgcache.h> -#include <apt-private/private-list.h> -#include <apt-private/private-cmndline.h> -#include <apt-private/private-show.h> #include <apt-private/private-cacheset.h> +#include <apt-private/private-cmndline.h> -#include <cassert> -#include <locale.h> -#include <iostream> -#include <unistd.h> -#include <errno.h> #include <regex.h> +#include <stddef.h> #include <stdio.h> -#include <iomanip> +#include <stdlib.h> +#include <unistd.h> #include <algorithm> +#include <cstring> +#include <iomanip> +#include <iostream> +#include <list> +#include <map> +#include <set> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 8e1d27e52..facb6002b 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -20,22 +20,15 @@ #include <apt-pkg/progress.h> #include <apt-pkg/cdromutl.h> #include <apt-pkg/strutl.h> -#include <apt-pkg/acquire.h> -#include <apt-pkg/acquire-item.h> #include <apt-pkg/cdrom.h> #include <apt-pkg/configuration.h> #include <apt-pkg/pkgsystem.h> -#include <locale.h> #include <iostream> -#include <fstream> #include <vector> -#include <algorithm> +#include <string> #include <sys/stat.h> -#include <fcntl.h> -#include <dirent.h> #include <unistd.h> -#include <stdio.h> #include <apt-private/private-cmndline.h> diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 26f0ea161..d95780c73 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -26,10 +26,10 @@ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/pkgsystem.h> -#include <locale.h> #include <iostream> #include <string> #include <vector> +#include <string.h> #include <apt-private/private-cmndline.h> diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc index c26cdc70a..04e13bde9 100644 --- a/cmdline/apt-dump-solver.cc +++ b/cmdline/apt-dump-solver.cc @@ -9,10 +9,12 @@ // Include Files /*{{{*/ #include <apt-pkg/edsp.h> -#include <config.h> - +#include <string.h> +#include <unistd.h> #include <cstdio> #include <iostream> + +#include <config.h> /*}}}*/ // ShowHelp - Show a help screen /*{{{*/ diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index a27008233..a82623444 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -18,8 +18,8 @@ #include <apt-pkg/init.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/progress.h> #include <apt-pkg/sourcelist.h> #include <apt-pkg/pkgcachegen.h> #include <apt-pkg/version.h> @@ -30,14 +30,13 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/pkgsystem.h> +#include <apt-pkg/dirstream.h> +#include <apt-pkg/mmap.h> +#include <iostream> #include <stdio.h> #include <string.h> -#include <stdlib.h> #include <unistd.h> -#include <locale.h> - -#include <fstream> #include "apt-extracttemplates.h" diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h index 6d07a09c2..9cc3f5f25 100644 --- a/cmdline/apt-extracttemplates.h +++ b/cmdline/apt-extracttemplates.h @@ -11,11 +11,12 @@ #define _APTEXTRACTTEMPLATE_H_ #include <apt-pkg/fileutl.h> -#include <apt-pkg/pkgcache.h> #include <apt-pkg/dirstream.h> #include <string> +class pkgCache; + class DebFile : public pkgDirStream { FileFd File; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9a4eb0881..a830c2387 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -27,66 +27,67 @@ // Include Files /*{{{*/ #include <config.h> +#include <apt-pkg/acquire-item.h> +#include <apt-pkg/algorithms.h> #include <apt-pkg/aptconfiguration.h> -#include <apt-pkg/error.h> +#include <apt-pkg/cachefile.h> +#include <apt-pkg/cacheset.h> +#include <apt-pkg/clean.h> #include <apt-pkg/cmndline.h> -#include <apt-pkg/init.h> +#include <apt-pkg/debmetaindex.h> #include <apt-pkg/depcache.h> -#include <apt-pkg/sourcelist.h> -#include <apt-pkg/algorithms.h> -#include <apt-pkg/acquire-item.h> -#include <apt-pkg/strutl.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/clean.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> -#include <apt-pkg/cachefile.h> -#include <apt-pkg/cacheset.h> -#include <apt-pkg/sptr.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/indexrecords.h> +#include <apt-pkg/init.h> #include <apt-pkg/md5.h> -#include <apt-pkg/versionmatch.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/pkgsystem.h> +#include <apt-pkg/metaindex.h> #include <apt-pkg/pkgrecords.h> -#include <apt-pkg/indexfile.h> +#include <apt-pkg/pkgsystem.h> +#include <apt-pkg/progress.h> +#include <apt-pkg/sourcelist.h> +#include <apt-pkg/srcrecords.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/version.h> +#include <apt-pkg/acquire.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> #include <apt-pkg/upgrade.h> -#include <apt-pkg/metaindex.h> -#include <apt-pkg/indexrecords.h> +#include <apt-private/acqprogress.h> +#include <apt-private/private-cacheset.h> +#include <apt-private/private-cachefile.h> +#include <apt-private/private-cmndline.h> #include <apt-private/private-download.h> #include <apt-private/private-install.h> -#include <apt-private/private-upgrade.h> +#include <apt-private/private-main.h> +#include <apt-private/private-moo.h> #include <apt-private/private-output.h> -#include <apt-private/private-cacheset.h> #include <apt-private/private-update.h> -#include <apt-private/private-cmndline.h> -#include <apt-private/private-moo.h> +#include <apt-private/private-upgrade.h> #include <apt-private/private-utils.h> -#include <apt-pkg/debmetaindex.h> - -#include <apt-private/acqprogress.h> - -#include <set> -#include <fstream> -#include <sstream> - -#include <locale.h> -#include <langinfo.h> -#include <termios.h> +#include <errno.h> +#include <signal.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/statfs.h> #include <sys/statvfs.h> -#include <signal.h> -#include <unistd.h> -#include <stdio.h> -#include <errno.h> -#include <regex.h> #include <sys/wait.h> - -#include <apt-private/private-output.h> -#include <apt-private/private-main.h> +#include <unistd.h> +#include <algorithm> +#include <fstream> +#include <iostream> +#include <set> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index 8ff2fa037..d66b3ffae 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -7,6 +7,7 @@ // Include Files /*{{{*/ #include <config.h> +#include <apt-pkg/configuration.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/error.h> #include <apt-pkg/init.h> @@ -20,14 +21,9 @@ #include <apt-private/private-output.h> #include <apt-private/private-cmndline.h> -#include <errno.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/wait.h> -#include <fcntl.h> - - +#include <iostream> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index 0c2ff0f43..b85c07c33 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -20,7 +20,15 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/pkgsystem.h> #include <apt-pkg/upgrade.h> - +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <string.h> +#include <iostream> +#include <list> +#include <string> #include <unistd.h> #include <cstdio> diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 53b5ec158..ed348358a 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -11,20 +11,31 @@ #include <apt-pkg/cacheset.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> #include <apt-pkg/init.h> -#include <apt-pkg/strutl.h> #include <apt-pkg/pkgsystem.h> -#include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/cacheiterators.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/depcache.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/pkgcache.h> + +#include <apt-private/private-cmndline.h> -#include <algorithm> #include <errno.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/wait.h> #include <fcntl.h> - -#include <apt-private/private-cmndline.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/wait.h> +#include <unistd.h> +#include <algorithm> +#include <fstream> +#include <iostream> +#include <string> +#include <vector> #include <apti18n.h> /*}}}*/ diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index 8d9cb23de..c2b11890a 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -25,9 +25,9 @@ #include <vector> #include <algorithm> - -#include <locale.h> -#include <unistd.h> +#include <stdio.h> +#include <iostream> +#include <string> #include <apti18n.h> /*}}}*/ diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 1b7626948..5dbf868d7 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -11,39 +11,12 @@ // Include Files /*{{{*/ #include<config.h> -#include <cassert> -#include <locale.h> -#include <iostream> -#include <unistd.h> -#include <errno.h> -#include <regex.h> -#include <stdio.h> -#include <iomanip> -#include <algorithm> - - +#include <apt-pkg/cmndline.h> #include <apt-pkg/error.h> -#include <apt-pkg/cachefile.h> -#include <apt-pkg/cacheset.h> #include <apt-pkg/init.h> -#include <apt-pkg/progress.h> -#include <apt-pkg/sourcelist.h> -#include <apt-pkg/cmndline.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> -#include <apt-pkg/pkgrecords.h> -#include <apt-pkg/srcrecords.h> -#include <apt-pkg/version.h> -#include <apt-pkg/policy.h> -#include <apt-pkg/tagfile.h> -#include <apt-pkg/algorithms.h> -#include <apt-pkg/sptr.h> #include <apt-pkg/pkgsystem.h> -#include <apt-pkg/indexfile.h> -#include <apt-pkg/metaindex.h> -#include <apt-pkg/hashes.h> - -#include <apti18n.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/configuration.h> #include <apt-private/private-list.h> #include <apt-private/private-search.h> @@ -55,11 +28,14 @@ #include <apt-private/private-upgrade.h> #include <apt-private/private-show.h> #include <apt-private/private-main.h> -#include <apt-private/private-utils.h> #include <apt-private/private-sources.h> - /*}}}*/ +#include <unistd.h> +#include <iostream> +#include <vector> +#include <apti18n.h> + /*}}}*/ static bool ShowHelp(CommandLine &) { diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index f13e4648a..692f19e25 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -17,14 +17,23 @@ #include <apt-pkg/cmndline.h> #include <apt-pkg/strutl.h> #include <apt-pkg/init.h> -#include <algorithm> +#include <apt-pkg/fileutl.h> +#include <algorithm> #include <climits> #include <sys/time.h> -#include <regex.h> - +#include <locale.h> +#include <stdio.h> +#include <sys/stat.h> +#include <time.h> +#include <functional> +#include <iostream> +#include <string> +#include <vector> + +#include "cachedb.h" +#include "override.h" #include "apt-ftparchive.h" -#include "contents.h" #include "multicompress.h" #include "writer.h" diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index c2318bf53..523c6b5fa 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -19,8 +19,12 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/debfile.h> #include <netinet/in.h> // htonl, etc +#include <ctype.h> +#include <stddef.h> +#include <sys/stat.h> #include "cachedb.h" diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index b9ced9418..49b9a0ef5 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -12,17 +12,19 @@ #ifndef CACHEDB_H #define CACHEDB_H - #include <apt-pkg/debfile.h> #include <db.h> -#include <inttypes.h> -#include <sys/stat.h> #include <errno.h> #include <string> +#include <string.h> +#include <stdint.h> +#include <stdio.h> #include "contents.h" +class FileFd; + class CacheDB { protected: diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index be4d2a61e..7a1fb779e 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -36,13 +36,12 @@ #include <config.h> #include <apt-pkg/debfile.h> -#include <apt-pkg/extracttar.h> +#include <apt-pkg/dirstream.h> #include <apt-pkg/error.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include "contents.h" diff --git a/ftparchive/contents.h b/ftparchive/contents.h index 4af9db574..dbbb83350 100644 --- a/ftparchive/contents.h +++ b/ftparchive/contents.h @@ -9,11 +9,13 @@ /*}}}*/ #ifndef CONTENTS_H #define CONTENTS_H - -#include <stdlib.h> -#include <stdio.h> + #include <apt-pkg/dirstream.h> +#include <stddef.h> +#include <stdio.h> +#include <string> + class debDebFile; class GenContents diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 1555d2f2d..f35d5304a 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -20,13 +20,15 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <apt-pkg/md5.h> +#include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/hashsum_template.h> -#include <fcntl.h> +#include <ctype.h> +#include <vector> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> -#include <iostream> #include "multicompress.h" #include <apti18n.h> diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 388fad22e..ddd1815a3 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -22,7 +22,8 @@ #include <string> #include <stdio.h> #include <sys/types.h> - +#include <time.h> + class MultiCompress { // An output file diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 38d76a6a3..b4cd49b6c 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -16,6 +16,9 @@ #include <apt-pkg/error.h> #include <stdio.h> +#include <ctype.h> +#include <string.h> +#include <utility> #include "override.h" diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index edc0fddea..153c4fb42 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -13,28 +13,37 @@ // Include Files /*{{{*/ #include <config.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/error.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/aptconfiguration.h> -#include <apt-pkg/md5.h> -#include <apt-pkg/hashes.h> #include <apt-pkg/deblistparser.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/gpgv.h> +#include <apt-pkg/hashes.h> +#include <apt-pkg/md5.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/debfile.h> +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/sha2.h> +#include <apt-pkg/tagfile.h> +#include <ctype.h> +#include <fnmatch.h> +#include <ftw.h> +#include <locale.h> +#include <string.h> +#include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #include <ctime> -#include <ftw.h> -#include <fnmatch.h> #include <iostream> #include <sstream> #include <memory> +#include <utility> +#include "apt-ftparchive.h" #include "writer.h" #include "cachedb.h" -#include "apt-ftparchive.h" #include "multicompress.h" #include <apti18n.h> diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 4932b0cc8..86884dcfc 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -13,14 +13,16 @@ #ifndef WRITER_H #define WRITER_H - #include <string> #include <stdio.h> #include <iostream> #include <vector> #include <map> #include <set> +#include <stdlib.h> +#include <sys/types.h> +#include "contents.h" #include "cachedb.h" #include "override.h" #include "apt-ftparchive.h" diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 3c14d9dfb..74e2ecc6b 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -19,9 +19,9 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/hashes.h> +#include <string> +#include <vector> #include <sys/stat.h> -#include <unistd.h> -#include <dlfcn.h> #include <iostream> #include <apti18n.h> diff --git a/methods/connect.cc b/methods/connect.cc index d9c9a1dd4..e2cbf4f5c 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -23,7 +23,7 @@ #include <errno.h> #include <unistd.h> #include <sstream> - +#include <string.h> #include<set> #include<string> diff --git a/methods/copy.cc b/methods/copy.cc index f2a8f9ed8..d59f032ff 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -17,9 +17,10 @@ #include <apt-pkg/error.h> #include <apt-pkg/hashes.h> +#include <string> #include <sys/stat.h> #include <sys/time.h> -#include <unistd.h> + #include <apti18n.h> /*}}}*/ diff --git a/methods/file.cc b/methods/file.cc index 3d0687c5b..12db62203 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -21,8 +21,9 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/strutl.h> +#include <string> #include <sys/stat.h> -#include <unistd.h> + #include <apti18n.h> /*}}}*/ diff --git a/methods/ftp.cc b/methods/ftp.cc index 4108b2da3..66787a7be 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -23,7 +23,11 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/netrc.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/strutl.h> +#include <ctype.h> +#include <stdlib.h> +#include <string.h> #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> @@ -42,6 +46,7 @@ #include "rfc2553emu.h" #include "connect.h" #include "ftp.h" + #include <apti18n.h> /*}}}*/ diff --git a/methods/ftp.h b/methods/ftp.h index 8055c389f..119d0c7e8 100644 --- a/methods/ftp.h +++ b/methods/ftp.h @@ -12,6 +12,8 @@ #include <apt-pkg/strutl.h> +#include <sys/types.h> +#include <time.h> #include <string> class FTPConn diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 25bf64ddd..ae521a2ed 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -1,19 +1,21 @@ #include <config.h> -#include <apt-pkg/error.h> #include <apt-pkg/acquire-method.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> -#include <apt-pkg/indexcopy.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> #include <apt-pkg/gpgv.h> +#include <apt-pkg/strutl.h> -#include <stdio.h> -#include <fcntl.h> +#include <ctype.h> #include <errno.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <sys/wait.h> +#include <unistd.h> #include <iostream> -#include <sstream> +#include <string> #include <vector> #include <apti18n.h> diff --git a/methods/gzip.cc b/methods/gzip.cc index 3269ffbb8..ace5e9f71 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -11,17 +11,19 @@ // Include Files /*{{{*/ #include <config.h> -#include <apt-pkg/fileutl.h> -#include <apt-pkg/error.h> #include <apt-pkg/acquire-method.h> -#include <apt-pkg/strutl.h> +#include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> #include <apt-pkg/hashes.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/aptconfiguration.h> +#include <string.h> #include <sys/stat.h> #include <sys/time.h> -#include <unistd.h> -#include <stdio.h> -#include <errno.h> +#include <string> +#include <vector> + #include <apti18n.h> /*}}}*/ diff --git a/methods/http.cc b/methods/http.cc index e1bb2e130..82f16e9b2 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -33,24 +33,21 @@ #include <apt-pkg/error.h> #include <apt-pkg/hashes.h> #include <apt-pkg/netrc.h> +#include <apt-pkg/strutl.h> +#include <stddef.h> +#include <stdlib.h> +#include <sys/select.h> +#include <cstring> #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> -#include <signal.h> #include <stdio.h> #include <errno.h> -#include <string.h> -#include <climits> #include <iostream> -#include <map> - -// Internet stuff -#include <netdb.h> #include "config.h" #include "connect.h" -#include "rfc2553emu.h" #include "http.h" #include <apti18n.h> diff --git a/methods/http.h b/methods/http.h index 450a42eed..5406ce4a7 100644 --- a/methods/http.h +++ b/methods/http.h @@ -12,14 +12,18 @@ #define APT_HTTP_H #include <apt-pkg/strutl.h> +#include <apt-pkg/acquire-method.h> #include <string> +#include <sys/time.h> +#include <iostream> #include "server.h" using std::cout; using std::endl; +class FileFd; class HttpMethod; class Hashes; diff --git a/methods/http_main.cc b/methods/http_main.cc index 2ca91bfc9..3b346a514 100644 --- a/methods/http_main.cc +++ b/methods/http_main.cc @@ -1,14 +1,9 @@ #include <config.h> -#include <apt-pkg/fileutl.h> -#include <apt-pkg/acquire-method.h> #include <signal.h> -#include "connect.h" -#include "rfc2553emu.h" #include "http.h" - int main() { setlocale(LC_ALL, ""); diff --git a/methods/https.cc b/methods/https.cc index 041214179..c4aff8f38 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -18,19 +18,20 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/netrc.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/strutl.h> #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> -#include <signal.h> #include <stdio.h> -#include <errno.h> -#include <string.h> #include <iostream> #include <sstream> +#include <ctype.h> +#include <stdlib.h> -#include "config.h" #include "https.h" + #include <apti18n.h> /*}}}*/ using namespace std; diff --git a/methods/https.h b/methods/https.h index 3199b29f2..faac8a3cd 100644 --- a/methods/https.h +++ b/methods/https.h @@ -11,14 +11,19 @@ #ifndef APT_HTTPS_H #define APT_HTTPS_H -#include <iostream> +#include <apt-pkg/acquire-method.h> + #include <curl/curl.h> +#include <iostream> +#include <stddef.h> +#include <string> #include "server.h" using std::cout; using std::endl; +class Hashes; class HttpsMethod; class FileFd; diff --git a/methods/mirror.cc b/methods/mirror.cc index b30636758..d3aef91bc 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -16,18 +16,18 @@ #include <apt-pkg/acquire-item.h> #include <apt-pkg/acquire.h> #include <apt-pkg/error.h> -#include <apt-pkg/hashes.h> #include <apt-pkg/sourcelist.h> #include <apt-pkg/configuration.h> #include <apt-pkg/metaindex.h> +#include <apt-pkg/strutl.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include <algorithm> -#include <fstream> #include <iostream> - -#include <stdarg.h> +#include <fstream> #include <sys/stat.h> -#include <sys/types.h> #include <sys/utsname.h> #include <dirent.h> diff --git a/methods/mirror.h b/methods/mirror.h index 1dd9f2ec6..6c0ce370e 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -11,6 +11,8 @@ #ifndef APT_MIRROR_H #define APT_MIRROR_H +#include <apt-pkg/acquire-method.h> + #include <iostream> #include <string> #include <vector> diff --git a/methods/rred.cc b/methods/rred.cc index 7169fc731..cabb3c456 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -8,19 +8,18 @@ #include <config.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/mmap.h> #include <apt-pkg/error.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/strutl.h> #include <apt-pkg/hashes.h> #include <apt-pkg/configuration.h> +#include <stddef.h> +#include <iostream> #include <string> #include <list> #include <vector> -#include <iterator> -#include <fcntl.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> diff --git a/methods/rsh.cc b/methods/rsh.cc index 8088cac38..bd46d2515 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -17,7 +17,11 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/hashes.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/acquire-method.h> +#include <apt-pkg/strutl.h> +#include <stdlib.h> +#include <string.h> #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> diff --git a/methods/rsh.h b/methods/rsh.h index d7efa3f06..c2c06acfe 100644 --- a/methods/rsh.h +++ b/methods/rsh.h @@ -11,6 +11,8 @@ #define APT_RSH_H #include <string> +#include <time.h> + #include <apt-pkg/strutl.h> class Hashes; diff --git a/methods/server.cc b/methods/server.cc index 90e83d1af..5a13f18a7 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -10,32 +10,27 @@ // Include Files /*{{{*/ #include <config.h> -#include <apt-pkg/fileutl.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> -#include <apt-pkg/hashes.h> -#include <apt-pkg/netrc.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> -#include <fcntl.h> +#include <ctype.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> #include <sys/stat.h> #include <sys/time.h> +#include <time.h> #include <unistd.h> -#include <signal.h> -#include <stdio.h> -#include <errno.h> -#include <string.h> -#include <climits> #include <iostream> +#include <limits> #include <map> +#include <string> +#include <vector> -// Internet stuff -#include <netdb.h> - -#include "config.h" -#include "connect.h" -#include "rfc2553emu.h" -#include "http.h" +#include "server.h" #include <apti18n.h> /*}}}*/ diff --git a/methods/server.h b/methods/server.h index b4870698f..d1e151f8a 100644 --- a/methods/server.h +++ b/methods/server.h @@ -12,7 +12,10 @@ #define APT_SERVER_H #include <apt-pkg/strutl.h> +#include <apt-pkg/acquire-method.h> +#include <time.h> +#include <iostream> #include <string> using std::cout; diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index fb9f7d34e..34476e1af 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -1,27 +1,29 @@ #include <config.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/fileutl.h> -#include <apt-pkg/error.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/init.h> - -#include <vector> -#include <string> -#include <list> -#include <sstream> +#include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> +#include <dirent.h> +#include <errno.h> +#include <netinet/in.h> +#include <pthread.h> +#include <regex.h> +#include <signal.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> #include <sys/socket.h> -#include <sys/types.h> #include <sys/stat.h> -#include <netinet/in.h> -#include <unistd.h> -#include <errno.h> #include <time.h> -#include <stdlib.h> -#include <dirent.h> -#include <signal.h> +#include <unistd.h> +#include <iostream> +#include <sstream> +#include <list> +#include <string> +#include <vector> static char const * httpcodeToStr(int const httpcode) /*{{{*/ { diff --git a/test/interactive-helper/extract-control.cc b/test/interactive-helper/extract-control.cc index 94fe9dca8..852ec4ee9 100644 --- a/test/interactive-helper/extract-control.cc +++ b/test/interactive-helper/extract-control.cc @@ -1,7 +1,10 @@ +#include <config.h> + #include <apt-pkg/debfile.h> #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> +#include <string> #include <iostream> #include <unistd.h> diff --git a/test/interactive-helper/mthdcat.cc b/test/interactive-helper/mthdcat.cc index 25d09a3f5..2961b2080 100644 --- a/test/interactive-helper/mthdcat.cc +++ b/test/interactive-helper/mthdcat.cc @@ -2,6 +2,8 @@ All this does is cat a file into the method without closing the FD when the file ends */ +#include <config.h> + #include <unistd.h> int main() diff --git a/test/interactive-helper/rpmver.cc b/test/interactive-helper/rpmver.cc index 15c96cbbe..017c92fba 100644 --- a/test/interactive-helper/rpmver.cc +++ b/test/interactive-helper/rpmver.cc @@ -1,3 +1,5 @@ +#include <config.h> + #include <apt-pkg/debversion.h> #include <rpm/rpmio.h> #include <rpm/misc.h> diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc index 88f5f0153..b87dcd935 100644 --- a/test/interactive-helper/test_udevcdrom.cc +++ b/test/interactive-helper/test_udevcdrom.cc @@ -1,7 +1,10 @@ +#include <config.h> + #include <apt-pkg/cdrom.h> -#include <stdio.h> -#include <assert.h> +#include <stddef.h> +#include <string> +#include <assert.h> #include <vector> #include <iostream> @@ -17,5 +20,4 @@ int main() std::cerr << l[i].DeviceName << " " << l[i].Mounted << " " << l[i].MountPath << std::endl; - } diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc index 9520d1b50..6aae9f563 100644 --- a/test/interactive-helper/testdeb.cc +++ b/test/interactive-helper/testdeb.cc @@ -1,7 +1,14 @@ +#include <config.h> + #include <apt-pkg/dirstream.h> #include <apt-pkg/debfile.h> #include <apt-pkg/error.h> #include <apt-pkg/extracttar.h> +#include <apt-pkg/arfile.h> +#include <apt-pkg/fileutl.h> + +#include <iostream> +#include <string> class NullStream : public pkgDirStream { diff --git a/test/libapt/cdromfindpackages_test.cc b/test/libapt/cdromfindpackages_test.cc index e9f5a51b0..583de1423 100644 --- a/test/libapt/cdromfindpackages_test.cc +++ b/test/libapt/cdromfindpackages_test.cc @@ -1,9 +1,13 @@ +#include <config.h> + #include <apt-pkg/cdrom.h> #include <apt-pkg/error.h> #include <algorithm> #include <string> #include <vector> +#include <stddef.h> +#include <iostream> #include "assert.h" diff --git a/test/libapt/cdromreducesourcelist_test.cc b/test/libapt/cdromreducesourcelist_test.cc index b0314769d..196d0136e 100644 --- a/test/libapt/cdromreducesourcelist_test.cc +++ b/test/libapt/cdromreducesourcelist_test.cc @@ -1,7 +1,7 @@ +#include <config.h> + #include <apt-pkg/cdrom.h> -#include <apt-pkg/error.h> -#include <algorithm> #include <string> #include <vector> diff --git a/test/libapt/commandline_test.cc b/test/libapt/commandline_test.cc index de8a30bd6..d8c5bc5bd 100644 --- a/test/libapt/commandline_test.cc +++ b/test/libapt/commandline_test.cc @@ -1,4 +1,7 @@ +#include <config.h> + #include <apt-pkg/cmndline.h> +#include <apt-pkg/configuration.h> #include "assert.h" diff --git a/test/libapt/commandlineasstring_test.cc b/test/libapt/commandlineasstring_test.cc index a38957d7e..5c005e956 100644 --- a/test/libapt/commandlineasstring_test.cc +++ b/test/libapt/commandlineasstring_test.cc @@ -1,3 +1,5 @@ +#include <config.h> + #include <apt-pkg/cmndline.h> #include <apt-pkg/configuration.h> diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc index 44f8e9d78..43b98f240 100644 --- a/test/libapt/compareversion_test.cc +++ b/test/libapt/compareversion_test.cc @@ -16,17 +16,16 @@ ##################################################################### */ /*}}}*/ -#include <apt-pkg/macros.h> +#include <config.h> + #include <apt-pkg/error.h> -#include <apt-pkg/version.h> #include <apt-pkg/debversion.h> #include <apt-pkg/fileutl.h> -#include <iostream> -#include <fstream> +#include <fstream> +#include <string> #include <stdlib.h> #include <unistd.h> -#include <sys/types.h> #include <sys/wait.h> using namespace std; diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc index d2efc1b4b..c9235500c 100644 --- a/test/libapt/configuration_test.cc +++ b/test/libapt/configuration_test.cc @@ -1,3 +1,5 @@ +#include <config.h> + #include <apt-pkg/configuration.h> #include <string> diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc index d256ea55a..8da832ba9 100644 --- a/test/libapt/fileutl_test.cc +++ b/test/libapt/fileutl_test.cc @@ -1,14 +1,13 @@ +#include <config.h> + #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> -#include "assert.h" #include <string> #include <vector> - -#include <stdio.h> -#include <iostream> #include <stdlib.h> +#include "assert.h" int main() { diff --git a/test/libapt/getarchitectures_test.cc b/test/libapt/getarchitectures_test.cc index 508d5e458..f4dfc6ae8 100644 --- a/test/libapt/getarchitectures_test.cc +++ b/test/libapt/getarchitectures_test.cc @@ -1,11 +1,12 @@ +#include <config.h> + #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> -#include "assert.h" #include <string> #include <vector> -#include <iostream> +#include "assert.h" int main() { diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index 51cfecee3..15aa4e879 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -1,3 +1,5 @@ +#include <config.h> + #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc index b2c95e840..df125fc83 100644 --- a/test/libapt/getlistoffilesindir_test.cc +++ b/test/libapt/getlistoffilesindir_test.cc @@ -1,12 +1,13 @@ +#include <config.h> + #include <apt-pkg/fileutl.h> -#include "assert.h" #include <string> #include <vector> - -#include <stdio.h> #include <iostream> +#include "assert.h" + #define P(x) std::string(argv[1]).append("/").append(x) int main(int argc,char *argv[]) diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc index 742fa53bd..e913fdc12 100644 --- a/test/libapt/globalerror_test.cc +++ b/test/libapt/globalerror_test.cc @@ -1,10 +1,14 @@ +#include <config.h> + #include <apt-pkg/error.h> -#include "assert.h" +#include <stddef.h> #include <string> #include <errno.h> #include <string.h> +#include "assert.h" + int main() { std::string const textOfErrnoZero(strerror(0)); diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc index 410e2c44d..d743faec6 100644 --- a/test/libapt/hashsums_test.cc +++ b/test/libapt/hashsums_test.cc @@ -1,12 +1,15 @@ +#include <config.h> + #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> #include <apt-pkg/sha2.h> #include <apt-pkg/strutl.h> #include <apt-pkg/hashes.h> #include <apt-pkg/fileutl.h> -#include <iostream> -#include <stdio.h> +#include <iostream> +#include <stdlib.h> +#include <string> #include "assert.h" @@ -50,22 +53,22 @@ int main(int argc, char** argv) // test HashSumValue which doesn't calculate but just stores sums { - string md5sum = argv[2]; + std::string md5sum = argv[2]; MD5SumValue md5(md5sum); equals(md5.Value(), md5sum); } { - string sha1sum = argv[3]; + std::string sha1sum = argv[3]; SHA1SumValue sha1(sha1sum); equals(sha1.Value(), sha1sum); } { - string sha2sum = argv[4]; + std::string sha2sum = argv[4]; SHA256SumValue sha2(sha2sum); equals(sha2.Value(), sha2sum); } { - string sha2sum = argv[5]; + std::string sha2sum = argv[5]; SHA512SumValue sha2(sha2sum); equals(sha2.Value(), sha2sum); } diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc index 69d8fae86..e04ab261b 100644 --- a/test/libapt/indexcopytosourcelist_test.cc +++ b/test/libapt/indexcopytosourcelist_test.cc @@ -1,8 +1,11 @@ +#include <config.h> + #include <apt-pkg/configuration.h> #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/indexcopy.h> #include <string> +#include <stdio.h> #include "assert.h" @@ -12,14 +15,14 @@ public: IndexCopy::ConvertToSourceList(CD, Path); return Path; } - bool GetFile(std::string &Filename,unsigned long long &Size) { return false; } - bool RewriteEntry(FILE *Target,std::string File) { return false; } + bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) { return false; } + bool RewriteEntry(FILE * /*Target*/, std::string /*File*/) { return false; } const char *GetFileName() { return NULL; } const char *Type() { return NULL; } }; -int main(int argc, char const *argv[]) { +int main() { NoCopy ic; std::string const CD("/media/cdrom/"); diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index 5a2c65573..5564e2bc0 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -1,5 +1,11 @@ +#include <config.h> + #include <apt-pkg/deblistparser.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/pkgcache.h> + +#include <string.h> +#include <string> #include "assert.h" diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index 0637df03b..71aa54f1e 100644 --- a/test/libapt/sourcelist_test.cc +++ b/test/libapt/sourcelist_test.cc @@ -1,11 +1,16 @@ +#include <config.h> + +#include <apt-pkg/configuration.h> #include <apt-pkg/sourcelist.h> -#include <apt-pkg/tagfile.h> +#include <apt-pkg/fileutl.h> -#include "assert.h" +#include <string> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include "assert.h" + char *tempfile = NULL; int tempfile_fd = -1; diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc index a4516e7a1..618f4daba 100644 --- a/test/libapt/strutil_test.cc +++ b/test/libapt/strutil_test.cc @@ -1,5 +1,10 @@ +#include <config.h> + #include <apt-pkg/strutl.h> +#include <string> +#include <vector> + #include "assert.h" int main() @@ -44,7 +49,7 @@ int main() // Split input = "status: libnet1:amd64: unpacked"; - vector<std::string> result = StringSplit(input, ": "); + std::vector<std::string> result = StringSplit(input, ": "); equals(result[0], "status"); equals(result[1], "libnet1:amd64"); equals(result[2], "unpacked"); diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc index 24f258275..aaf46e3e9 100644 --- a/test/libapt/tagfile_test.cc +++ b/test/libapt/tagfile_test.cc @@ -1,11 +1,15 @@ +#include <config.h> + #include <apt-pkg/fileutl.h> #include <apt-pkg/tagfile.h> -#include "assert.h" +#include <string> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include "assert.h" + char *tempfile = NULL; int tempfile_fd = -1; diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc index 8216ade71..6559f1390 100644 --- a/test/libapt/uri_test.cc +++ b/test/libapt/uri_test.cc @@ -1,5 +1,9 @@ +#include <config.h> + #include <apt-pkg/strutl.h> +#include <string> + #include "assert.h" int main() { -- cgit v1.2.3 From a02db58fd50ef7fc2f0284852c6b3f98e458a232 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Mar 2014 00:33:10 +0100 Subject: follow method attribute suggestions by gcc Git-Dch: Ignore Reported-By: gcc -Wsuggest-attribute={pure,const,noreturn} --- apt-inst/extract.cc | 2 +- apt-inst/filelist.cc | 6 +++--- apt-pkg/acquire-item.cc | 2 +- apt-pkg/acquire.cc | 6 +++--- apt-pkg/acquire.h | 4 ++-- apt-pkg/algorithms.h | 2 +- apt-pkg/cacheiterators.h | 35 ++++++++++++++++++----------------- apt-pkg/cacheset.cc | 10 +++++----- apt-pkg/contrib/cmndline.h | 8 +++++--- apt-pkg/contrib/crc-16.h | 4 +++- apt-pkg/contrib/error.h | 8 ++++---- apt-pkg/contrib/fileutl.h | 2 +- apt-pkg/contrib/gpgv.h | 2 +- apt-pkg/contrib/hashes.cc | 2 +- apt-pkg/contrib/hashes.h | 2 +- apt-pkg/contrib/strutl.h | 36 ++++++++++++++++++------------------ apt-pkg/deb/debindexfile.cc | 2 +- apt-pkg/deb/debindexfile.h | 8 ++++---- apt-pkg/deb/debsystem.cc | 2 +- apt-pkg/deb/debversion.h | 14 +++++++------- apt-pkg/depcache.cc | 4 ++-- apt-pkg/depcache.h | 3 ++- apt-pkg/edsp/edspindexfile.h | 2 +- apt-pkg/edsp/edsplistparser.cc | 2 +- apt-pkg/edsp/edspsystem.h | 8 ++++---- apt-pkg/indexcopy.cc | 6 ++---- apt-pkg/indexfile.h | 2 +- apt-pkg/indexrecords.cc | 14 +++++++------- apt-pkg/install-progress.cc | 4 ++-- apt-pkg/orderlist.h | 8 ++++---- apt-pkg/packagemanager.h | 2 +- apt-pkg/pkgcache.h | 14 ++++++++------ apt-pkg/pkgcachegen.h | 2 +- apt-pkg/pkgsystem.cc | 4 +++- apt-pkg/policy.cc | 4 ++-- apt-pkg/sourcelist.h | 3 ++- apt-pkg/srcrecords.h | 3 ++- apt-pkg/tagfile.cc | 2 +- apt-pkg/vendor.cc | 2 +- apt-pkg/version.h | 2 +- apt-pkg/versionmatch.h | 14 +++++++------- apt-private/private-cachefile.h | 2 +- apt-private/private-cmndline.cc | 2 +- cmdline/apt-cache.cc | 2 +- cmdline/apt-cdrom.cc | 2 +- methods/ftp.h | 2 +- methods/http.cc | 4 ++-- methods/rsh.h | 2 +- methods/server.h | 2 +- test/libapt/assert.h | 4 +++- 50 files changed, 148 insertions(+), 136 deletions(-) diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index b2956d91d..b60784450 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -260,7 +260,7 @@ bool pkgExtract::DoItem(Item &Itm, int &/*Fd*/) // Extract::Finished - Sequence finished, erase the temp files /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgExtract::Finished() +APT_CONST bool pkgExtract::Finished() { return true; } diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index b4a4f3d9d..4dbc4a2d7 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -85,7 +85,7 @@ pkgFLCache::Header::Header() // FLCache::Header::CheckSizes - Check if the two headers have same *sz /*{{{*/ // --------------------------------------------------------------------- /* Compare to make sure we are matching versions */ -bool pkgFLCache::Header::CheckSizes(Header &Against) const +APT_PURE bool pkgFLCache::Header::CheckSizes(Header &Against) const { if (HeaderSz == Against.HeaderSz && NodeSz == Against.NodeSz && @@ -353,7 +353,7 @@ pkgFLCache::NodeIterator pkgFLCache::GetNode(const char *Name, // --------------------------------------------------------------------- /* This is one of two hashing functions. The other is inlined into the GetNode routine. */ -pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde) +APT_PURE pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde) { // Hash the node unsigned long HashPos = 0; @@ -570,7 +570,7 @@ bool pkgFLCache::AddConfFile(const char *Name,const char *NameEnd, // --------------------------------------------------------------------- /* Since the package pointer is indirected in all sorts of interesting ways this is used to get a pointer to the owning package */ -pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const +APT_PURE pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const { if (Nde->Pointer == 0) return 0; diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 44a1f32df..ad38e3116 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -2162,7 +2162,7 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*}}}*/ // AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/ // --------------------------------------------------------------------- -bool pkgAcqArchive::IsTrusted() +APT_PURE bool pkgAcqArchive::IsTrusted() { return Trusted; } diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index a654d8219..a187a00ae 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -526,7 +526,7 @@ bool pkgAcquire::Clean(string Dir) // Acquire::TotalNeeded - Number of bytes to fetch /*{{{*/ // --------------------------------------------------------------------- /* This is the total number of bytes needed */ -unsigned long long pkgAcquire::TotalNeeded() +APT_PURE unsigned long long pkgAcquire::TotalNeeded() { unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); ++I) @@ -537,7 +537,7 @@ unsigned long long pkgAcquire::TotalNeeded() // Acquire::FetchNeeded - Number of bytes needed to get /*{{{*/ // --------------------------------------------------------------------- /* This is the number of bytes that is not local */ -unsigned long long pkgAcquire::FetchNeeded() +APT_PURE unsigned long long pkgAcquire::FetchNeeded() { unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); ++I) @@ -549,7 +549,7 @@ unsigned long long pkgAcquire::FetchNeeded() // Acquire::PartialPresent - Number of partial bytes we already have /*{{{*/ // --------------------------------------------------------------------- /* This is the number of bytes that is not local */ -unsigned long long pkgAcquire::PartialPresent() +APT_PURE unsigned long long pkgAcquire::PartialPresent() { unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); ++I) diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 1aac0ba11..ef16d8556 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -298,7 +298,7 @@ class pkgAcquire * \return the worker immediately following I, or \b NULL if none * exists. */ - Worker *WorkerStep(Worker *I); + Worker *WorkerStep(Worker *I) APT_PURE; /** \brief Get the head of the list of items. */ inline ItemIterator ItemsBegin() {return Items.begin();}; @@ -481,7 +481,7 @@ class pkgAcquire::Queue * \return the first item in the queue whose URI is #URI and that * is being downloaded by #Owner. */ - QItem *FindItem(std::string URI,pkgAcquire::Worker *Owner); + QItem *FindItem(std::string URI,pkgAcquire::Worker *Owner) APT_PURE; /** Presumably this should start downloading an item? * diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 82b6426c6..f35bd9a13 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -114,7 +114,7 @@ class pkgProblemResolver /*{{{*/ // Sort stuff static pkgProblemResolver *This; - static int ScoreSort(const void *a,const void *b); + static int ScoreSort(const void *a,const void *b) APT_PURE; struct PackageKill { diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index d9c8ed1e4..2fdf8404d 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -30,6 +30,7 @@ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H #include<apt-pkg/pkgcache.h> +#include<apt-pkg/macros.h> #include<iterator> #include <iosfwd> @@ -163,15 +164,15 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> { inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge || (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);} inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;} - inline GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);} + inline APT_PURE GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);} - inline VerIterator VersionList() const; - inline VerIterator CurrentVer() const; - inline DepIterator RevDependsList() const; - inline PrvIterator ProvidesList() const; - OkState State() const; - const char *CandVersion() const; - const char *CurVersion() const; + inline VerIterator VersionList() const APT_PURE; + inline VerIterator CurrentVer() const APT_PURE; + inline DepIterator RevDependsList() const APT_PURE; + inline PrvIterator ProvidesList() const APT_PURE; + OkState State() const APT_PURE; + const char *CandVersion() const APT_PURE; + const char *CurVersion() const APT_PURE; //Nice printable representation friend std::ostream& operator <<(std::ostream& out, PkgIterator i); @@ -224,7 +225,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { inline VerFileIterator FileList() const; bool Downloadable() const; inline const char *PriorityType() const {return Owner->Priority(S->Priority);} - const char *MultiArchType() const; + const char *MultiArchType() const APT_PURE; std::string RelStr() const; bool Automatic() const; @@ -286,13 +287,13 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> { inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);} inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);} inline bool Reverse() const {return Type == DepRev;} - bool IsCritical() const; - bool IsNegative() const; - bool IsIgnorable(PrvIterator const &Prv) const; - bool IsIgnorable(PkgIterator const &Pkg) const; - bool IsMultiArchImplicit() const; - bool IsSatisfied(VerIterator const &Ver) const; - bool IsSatisfied(PrvIterator const &Prv) const; + bool IsCritical() const APT_PURE; + bool IsNegative() const APT_PURE; + bool IsIgnorable(PrvIterator const &Prv) const APT_PURE; + bool IsIgnorable(PkgIterator const &Pkg) const APT_PURE; + bool IsMultiArchImplicit() const APT_PURE; + bool IsSatisfied(VerIterator const &Ver) const APT_PURE; + bool IsSatisfied(PrvIterator const &Prv) const APT_PURE; void GlobOr(DepIterator &Start,DepIterator &End); Version **AllTargets() const; bool SmartTargetPkg(PkgIterator &Result) const; @@ -337,7 +338,7 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> { inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);} inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);} - bool IsMultiArchImplicit() const; + bool IsMultiArchImplicit() const APT_PURE; inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {} inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) : diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index a58631d5b..d453a2bfb 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -614,7 +614,7 @@ void CacheSetHelper::canNotFindFnmatch(PackageContainerInterface * const pci, pk } #endif /*}}}*/ // canNotFindPackage - handle the case no package is found from a string/*{{{*/ -void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string const &/*str*/) { +APT_CONST void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string const &/*str*/) { } /*}}}*/ // canNotFindAllVer /*{{{*/ @@ -663,24 +663,24 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache } /*}}}*/ // showTaskSelection /*{{{*/ -void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &/*pkg*/, +APT_CONST void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &/*pkg*/, std::string const &/*pattern*/) { } /*}}}*/ // showRegExSelection /*{{{*/ -void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &/*pkg*/, +APT_CONST 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, +APT_CONST void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern) { } /*}}}*/ #endif // showSelectedVersion /*{{{*/ -void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/, +APT_CONST void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/, pkgCache::VerIterator const /*Ver*/, std::string const &/*ver*/, bool const /*verIsRel*/) { diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 180276633..143df58b2 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -44,6 +44,8 @@ #ifndef PKGLIB_CMNDLINE_H #define PKGLIB_CMNDLINE_H +#include <apt-pkg/macros.h> + #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/configuration.h> #endif @@ -80,14 +82,14 @@ class CommandLine bool Parse(int argc,const char **argv); void ShowHelp(); - unsigned int FileSize() const; + unsigned int FileSize() const APT_PURE; bool DispatchArg(Dispatch *List,bool NoMatch = true); static char const * GetCommand(Dispatch const * const Map, - unsigned int const argc, char const * const * const argv); + unsigned int const argc, char const * const * const argv) APT_PURE; static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt, - char const *ConfName, unsigned long Flags); + char const *ConfName, unsigned long Flags) APT_CONST; CommandLine(Args *AList,Configuration *Conf); ~CommandLine(); diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h index 702de40b2..08acdafb7 100644 --- a/apt-pkg/contrib/crc-16.h +++ b/apt-pkg/contrib/crc-16.h @@ -10,8 +10,10 @@ #ifndef APTPKG_CRC16_H #define APTPKG_CRC16_H +#include <apt-pkg/macros.h> + #define INIT_FCS 0xffff unsigned short AddCRC16(unsigned short fcs, void const *buf, - unsigned long long len); + unsigned long long len) APT_PURE; #endif diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 919b1e6d4..ed8c19153 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -141,7 +141,7 @@ public: /*{{{*/ */ bool InsertErrno(MsgType type, const char* Function, const char* Description, va_list &args, - int const errsv, size_t &msgSize); + int const errsv, size_t &msgSize) APT_COLD; /** \brief add an fatal error message to the list * @@ -225,7 +225,7 @@ public: /*{{{*/ * * \return \b true if an error is included in the list, \b false otherwise */ - inline bool PendingError() const {return PendingFlag;}; + inline bool PendingError() const APT_PURE {return PendingFlag;}; /** \brief is the list empty? * @@ -237,7 +237,7 @@ public: /*{{{*/ * * \return \b true if an the list is empty, \b false otherwise */ - bool empty(MsgType const &threshold = WARNING) const; + bool empty(MsgType const &threshold = WARNING) const APT_PURE; /** \brief returns and removes the first (or last) message in the list * @@ -303,7 +303,7 @@ public: /*{{{*/ void MergeWithStack(); /** \brief return the deep of the stack */ - size_t StackCount() const { + size_t StackCount() const APT_PURE { return Stacks.size(); } diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 6fdea1294..35f3ab0f4 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -119,7 +119,7 @@ class FileFd // Simple manipulators inline int Fd() {return iFd;}; inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);}; - gzFile gzFd() APT_DEPRECATED; + gzFile gzFd() APT_DEPRECATED APT_PURE; inline bool IsOpen() {return iFd >= 0;}; inline bool Failed() {return (Flags & Fail) == Fail;}; diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index ab3c68de5..f018893fd 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -41,7 +41,7 @@ class FileFd; */ void ExecGPGV(std::string const &File, std::string const &FileSig, int const &statusfd, int fd[2]) APT_NORETURN; -inline void ExecGPGV(std::string const &File, std::string const &FileSig, +inline APT_NORETURN void ExecGPGV(std::string const &File, std::string const &FileSig, int const &statusfd = -1) { int fd[2]; ExecGPGV(File, FileSig, statusfd, fd); diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 5efafa511..1fce0d75f 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -116,7 +116,7 @@ const char** HashString::SupportedHashes() return _SupportedHashes; } -bool HashString::empty() const +APT_PURE bool HashString::empty() const { return (Type.empty() || Hash.empty()); } diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 979ee1eb8..5cd1af03b 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -66,7 +66,7 @@ class HashString bool empty() const; // return the list of hashes we support - static const char** SupportedHashes(); + static APT_CONST const char** SupportedHashes(); }; class Hashes diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 79479957d..185cdc3fc 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -107,43 +107,43 @@ int tolower_ascii(int const c) APT_CONST APT_HOT; std::string StripEpoch(const std::string &VerStr); #define APT_MKSTRCMP(name,func) \ -inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));} \ -inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \ -inline int name(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));} \ -inline int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());} \ -inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);} +inline APT_PURE int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));} \ +inline APT_PURE int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \ +inline APT_PURE int name(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));} \ +inline APT_PURE int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());} \ +inline APT_PURE int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);} #define APT_MKSTRCMP2(name,func) \ -inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \ -inline int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));} \ -inline int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());} \ -inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);} +inline APT_PURE int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));} \ +inline APT_PURE int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));} \ +inline APT_PURE int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());} \ +inline APT_PURE int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);} -int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd); -int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd); +int APT_PURE stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd); +int APT_PURE stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd); /* We assume that GCC 3 indicates that libstdc++3 is in use too. In that case the definition of string::const_iterator is not the same as const char * and we need these extra functions */ #if __GNUC__ >= 3 -int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, +int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, const char *B,const char *BEnd); -int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, +int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, std::string::const_iterator B,std::string::const_iterator BEnd); -int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, +int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, const char *B,const char *BEnd); -int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, +int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, std::string::const_iterator B,std::string::const_iterator BEnd); -inline int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));} -inline int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));} +inline APT_PURE int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));} +inline APT_PURE int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));} #endif APT_MKSTRCMP2(stringcmp,stringcmp) APT_MKSTRCMP2(stringcasecmp,stringcasecmp) // Return the length of a NULL-terminated string array -size_t strv_length(const char **str_array); +size_t APT_PURE strv_length(const char **str_array); inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);} diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 1b35d0d52..eee758b7a 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -660,7 +660,7 @@ pkgCache::PkgFileIterator debStatusIndex::FindInCache(pkgCache &Cache) const // StatusIndex::Exists - Check if the index is available /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debStatusIndex::Exists() const +APT_CONST bool debStatusIndex::Exists() const { // Abort if the file does not exist. return true; diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 3bcb3b64f..017c69a0a 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -38,7 +38,7 @@ class debStatusIndex : public pkgIndexFile public: - virtual const Type *GetType() const; + virtual const Type *GetType() const APT_CONST; // Interface for acquire virtual std::string Describe(bool /*Short*/) const {return File;}; @@ -71,7 +71,7 @@ class debPackagesIndex : public pkgIndexFile public: - virtual const Type *GetType() const; + virtual const Type *GetType() const APT_CONST; // Stuff for accessing files on remote items virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const; @@ -110,7 +110,7 @@ class debTranslationsIndex : public pkgIndexFile public: - virtual const Type *GetType() const; + virtual const Type *GetType() const APT_CONST; // Interface for acquire virtual std::string Describe(bool Short) const; @@ -142,7 +142,7 @@ class debSourcesIndex : public pkgIndexFile public: - virtual const Type *GetType() const; + virtual const Type *GetType() const APT_CONST; // Stuff for accessing files on remote items virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record, diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index db557e537..142f3a6e6 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -202,7 +202,7 @@ bool debSystem::Initialize(Configuration &Cnf) // --------------------------------------------------------------------- /* The standard name for a deb is 'deb'.. There are no separate versions of .deb to worry about.. */ -bool debSystem::ArchiveSupported(const char *Type) +APT_PURE bool debSystem::ArchiveSupported(const char *Type) { if (strcmp(Type,"deb") == 0) return true; diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h index 981ea9ad2..434ff4a2e 100644 --- a/apt-pkg/deb/debversion.h +++ b/apt-pkg/deb/debversion.h @@ -19,19 +19,19 @@ class debVersioningSystem : public pkgVersioningSystem { public: - + static int CmpFragment(const char *A, const char *AEnd, const char *B, - const char *BEnd); - + const char *BEnd) APT_PURE; + // Compare versions.. virtual int DoCmpVersion(const char *A,const char *Aend, - const char *B,const char *Bend); - virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer); - virtual int DoCmpReleaseVer(const char *A,const char *Aend, + const char *B,const char *Bend) APT_PURE; + virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_PURE; + virtual APT_PURE int DoCmpReleaseVer(const char *A,const char *Aend, const char *B,const char *Bend) { return DoCmpVersion(A,Aend,B,Bend); - } + } virtual std::string UpstreamVersion(const char *A); debVersioningSystem(); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 149dbc0e7..e2c412757 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1691,9 +1691,9 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) } /*}}}*/ // Policy::GetPriority - Get the priority of the package pin /*{{{*/ -signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &/*Pkg*/) +APT_CONST signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &/*Pkg*/) { return 0; } -signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &/*File*/) +APT_CONST signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &/*File*/) { return 0; } /*}}}*/ pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() /*{{{*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 3ffc3b47d..bde648c65 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -41,6 +41,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> +#include <apt-pkg/macros.h> #include <stddef.h> @@ -239,7 +240,7 @@ class pkgDepCache : protected pkgCache::Namespace unsigned char DepState; // DepState Flags // Update of candidate version - const char *StripEpoch(const char *Ver); + const char *StripEpoch(const char *Ver) APT_PURE; void Update(PkgIterator Pkg,pkgCache &Cache); // Various test members for the current status of the package diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h index bd3b41cf2..609a2cde4 100644 --- a/apt-pkg/edsp/edspindexfile.h +++ b/apt-pkg/edsp/edspindexfile.h @@ -25,7 +25,7 @@ class edspIndex : public debStatusIndex public: - virtual const Type *GetType() const; + virtual const Type *GetType() const APT_CONST; virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc index 139deb9f1..212dc7840 100644 --- a/apt-pkg/edsp/edsplistparser.cc +++ b/apt-pkg/edsp/edsplistparser.cc @@ -86,7 +86,7 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg, } /*}}}*/ // ListParser::LoadReleaseInfo - Load the release information /*{{{*/ -bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator & /*FileI*/, +APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator & /*FileI*/, FileFd & /*File*/, std::string /*component*/) { return true; diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h index eafff39ba..65e36d714 100644 --- a/apt-pkg/edsp/edspsystem.h +++ b/apt-pkg/edsp/edspsystem.h @@ -31,11 +31,11 @@ class edspSystem : public pkgSystem public: - virtual bool Lock(); - virtual bool UnLock(bool NoErrors = false); - virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const; + virtual bool Lock() APT_CONST; + virtual bool UnLock(bool NoErrors = false) APT_CONST; + virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_CONST; virtual bool Initialize(Configuration &Cnf); - virtual bool ArchiveSupported(const char *Type); + virtual bool ArchiveSupported(const char *Type) APT_CONST; virtual signed Score(Configuration const &Cnf); virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List); virtual bool FindIndex(pkgCache::PkgFileIterator File, diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 3a1385fa5..854ba1bd7 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -642,15 +642,13 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, } /*}}}*/ // SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV /*{{{*/ -bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, +APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd, int fd[2]) { ExecGPGV(File, FileOut, statusfd, fd); - return false; } -bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, +APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd) { ExecGPGV(File, FileOut, statusfd); - return false; } /*}}}*/ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 98cdda603..b5c9ac77e 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -54,7 +54,7 @@ class pkgIndexFile // Global list of Items supported static Type **GlobalList; static unsigned long GlobalListLen; - static Type *GetType(const char *Type); + static Type *GetType(const char *Type) APT_PURE; const char *Label; diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 1123d1690..5353d1098 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -27,33 +27,33 @@ using std::string; -string indexRecords::GetDist() const +APT_PURE string indexRecords::GetDist() const { return this->Dist; } -string indexRecords::GetSuite() const +APT_PURE string indexRecords::GetSuite() const { return this->Suite; } -bool indexRecords::CheckDist(const string MaybeDist) const +APT_PURE bool indexRecords::CheckDist(const string MaybeDist) const { return (this->Dist == MaybeDist || this->Suite == MaybeDist); } -string indexRecords::GetExpectedDist() const +APT_PURE string indexRecords::GetExpectedDist() const { return this->ExpectedDist; } -time_t indexRecords::GetValidUntil() const +APT_PURE time_t indexRecords::GetValidUntil() const { return this->ValidUntil; } -const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) +APT_PURE const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) { std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey); if (sum == Entries.end()) @@ -61,7 +61,7 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) return sum->second; } -bool indexRecords::Exists(string const &MetaKey) const +APT_PURE bool indexRecords::Exists(string const &MetaKey) const { return Entries.count(MetaKey) == 1; } diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index 6f43e0bc0..dfe4fb18c 100644 --- a/apt-pkg/install-progress.cc +++ b/apt-pkg/install-progress.cc @@ -93,7 +93,7 @@ void PackageManagerProgressFd::StartDpkg() WriteToStatusFd(status.str()); } -void PackageManagerProgressFd::Stop() +APT_CONST void PackageManagerProgressFd::Stop() { } @@ -176,7 +176,7 @@ void PackageManagerProgressDeb822Fd::StartDpkg() WriteToStatusFd(status.str()); } -void PackageManagerProgressDeb822Fd::Stop() +APT_CONST void PackageManagerProgressDeb822Fd::Stop() { } diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h index 1fdfbf559..b8bad81b3 100644 --- a/apt-pkg/orderlist.h +++ b/apt-pkg/orderlist.h @@ -70,9 +70,9 @@ class pkgOrderList : protected pkgCache::Namespace // For pre sorting static pkgOrderList *Me; - static int OrderCompareA(const void *a, const void *b); - static int OrderCompareB(const void *a, const void *b); - int FileCmp(PkgIterator A,PkgIterator B); + static int OrderCompareA(const void *a, const void *b) APT_PURE; + static int OrderCompareB(const void *a, const void *b) APT_PURE; + int FileCmp(PkgIterator A,PkgIterator B) APT_PURE; public: @@ -102,7 +102,7 @@ class pkgOrderList : protected pkgCache::Namespace inline void RmFlag(Package *Pkg,unsigned long F) {Flags[Pkg->ID] &= ~F;}; // IsNow will return true if the Pkg has been not been either configured or unpacked inline bool IsNow(PkgIterator Pkg) {return (Flags[Pkg->ID] & (States & (~Removed))) == 0;}; - bool IsMissing(PkgIterator Pkg); + bool IsMissing(PkgIterator Pkg) APT_PURE; void WipeFlags(unsigned long F); void SetFileList(std::string *FileList) {this->FileList = FileList;}; diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index a86b176a4..344ed9192 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -75,7 +75,7 @@ class pkgPackageManager : protected pkgCache::Namespace bool CreateOrderList(); // Analysis helpers - bool DepAlwaysTrue(DepIterator D); + bool DepAlwaysTrue(DepIterator D) APT_PURE; // Install helpers bool ConfigureAll(); diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index b3a714511..5e8a9630a 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -74,9 +74,11 @@ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H +#include <apt-pkg/mmap.h> +#include <apt-pkg/macros.h> + #include <string> #include <time.h> -#include <apt-pkg/mmap.h> #ifndef APT_8_CLEANER_HEADERS using std::string; @@ -156,8 +158,8 @@ class pkgCache /*{{{*/ std::string CacheFile; MMap ⤅ - unsigned long sHash(const std::string &S) const; - unsigned long sHash(const char *S) const; + unsigned long sHash(const std::string &S) const APT_PURE; + unsigned long sHash(const char *S) const APT_PURE; public: @@ -207,8 +209,8 @@ class pkgCache /*{{{*/ pkgVersioningSystem *VS; // Converters - static const char *CompTypeDeb(unsigned char Comp); - static const char *CompType(unsigned char Comp); + static const char *CompTypeDeb(unsigned char Comp) APT_CONST; + static const char *CompType(unsigned char Comp) APT_CONST; static const char *DepType(unsigned char Dep); pkgCache(MMap *Map,bool DoMap = true); @@ -318,7 +320,7 @@ struct pkgCache::Header /** \brief Size of the complete cache file */ unsigned long CacheFileSize; - bool CheckSizes(Header &Against) const; + bool CheckSizes(Header &Against) const APT_PURE; Header(); }; /*}}}*/ diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 9ccf71c7b..898b34358 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -104,7 +104,7 @@ class pkgCacheGenerator /*{{{*/ bool HasFileDeps() {return FoundFileDeps;}; bool MergeFileProvides(ListParser &List); - bool FinishCache(OpProgress *Progress) APT_DEPRECATED; + bool FinishCache(OpProgress *Progress) APT_DEPRECATED APT_CONST; static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap = 0,bool AllowMem = false); diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc index ee6c3f4ec..14d090c7a 100644 --- a/apt-pkg/pkgsystem.cc +++ b/apt-pkg/pkgsystem.cc @@ -13,6 +13,8 @@ #include<config.h> #include <apt-pkg/pkgsystem.h> +#include <apt-pkg/macros.h> + #include <cassert> #include <cstring> /*}}}*/ @@ -35,7 +37,7 @@ pkgSystem::pkgSystem() : Label(NULL), VS(NULL) // System::GetSystem - Get the named system /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgSystem *pkgSystem::GetSystem(const char *Label) +APT_PURE pkgSystem *pkgSystem::GetSystem(const char *Label) { for (unsigned I = 0; I != GlobalListLen; I++) if (strcmp(SysList[I]->Label,Label) == 0) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index ae30b6f50..3cfc32829 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -333,7 +333,7 @@ pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator const &Pkg) // Policy::GetPriority - Get the priority of the package pin /*{{{*/ // --------------------------------------------------------------------- /* */ -signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg) +APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg) { if (Pins[Pkg->ID].Type != pkgVersionMatch::None) { @@ -345,7 +345,7 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg) return 0; } -signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File) +APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File) { return PFPriority[File->ID]; } diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index af7569375..9df0c1d74 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -29,6 +29,7 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> +#include <apt-pkg/macros.h> #include <time.h> @@ -63,7 +64,7 @@ class pkgSourceList // Global list of Items supported static Type **GlobalList; static unsigned long GlobalListLen; - static Type *GetType(const char *Type); + static Type *GetType(const char *Type) APT_PURE; const char *Name; const char *Label; diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index ed69d0d72..9915debfe 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -13,6 +13,7 @@ #ifndef PKGLIB_SRCRECORDS_H #define PKGLIB_SRCRECORDS_H +#include <apt-pkg/macros.h> #include <string> #include <vector> @@ -73,7 +74,7 @@ class pkgSrcRecords //FIXME: Add a parameter to specify which architecture to use for [wildcard] matching virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0; - static const char *BuildDepType(unsigned char const &Type); + static const char *BuildDepType(unsigned char const &Type) APT_PURE; virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0; diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 906321456..91d176e3c 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -85,7 +85,7 @@ pkgTagFile::~pkgTagFile() } /*}}}*/ // TagFile::Offset - Return the current offset in the buffer /*{{{*/ -unsigned long pkgTagFile::Offset() +APT_PURE unsigned long pkgTagFile::Offset() { return d->iOffset; } diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc index 986636e97..d4add560e 100644 --- a/apt-pkg/vendor.cc +++ b/apt-pkg/vendor.cc @@ -35,7 +35,7 @@ const std::string Vendor::LookupFingerprint(std::string Print) const return (*Elt).second; } -bool Vendor::CheckDist(std::string /*Dist*/) +APT_CONST bool Vendor::CheckDist(std::string /*Dist*/) { return true; } diff --git a/apt-pkg/version.h b/apt-pkg/version.h index e0e0e6c14..d98809f7e 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -33,7 +33,7 @@ class pkgVersioningSystem // Global list of VS's static pkgVersioningSystem **GlobalList; static unsigned long GlobalListLen; - static pkgVersioningSystem *GetVS(const char *Label); + static pkgVersioningSystem *GetVS(const char *Label) APT_PURE; const char *Label; diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index a889878ad..4c8f704c8 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -45,7 +45,7 @@ using std::string; #endif class pkgVersionMatch -{ +{ // Version Matching std::string VerStr; bool VerPrefixMatch; @@ -61,20 +61,20 @@ class pkgVersionMatch std::string RelComponent; std::string RelArchitecture; bool MatchAll; - + // Origin Matching std::string OrSite; - + public: - + enum MatchType {None = 0,Version,Release,Origin} Type; - - bool MatchVer(const char *A,std::string B,bool Prefix); + + bool MatchVer(const char *A,std::string B,bool Prefix) APT_PURE; bool ExpressionMatches(const char *pattern, const char *string); bool ExpressionMatches(const std::string& pattern, const char *string); bool FileMatch(pkgCache::PkgFileIterator File); pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg); - + pkgVersionMatch(std::string Data,MatchType Type); }; diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h index 94d93df2c..67c5e8cdc 100644 --- a/apt-private/private-cachefile.h +++ b/apt-private/private-cachefile.h @@ -13,7 +13,7 @@ class CacheFile : public pkgCacheFile { static pkgCache *SortCache; - static int NameComp(const void *a,const void *b); + static int NameComp(const void *a,const void *b) APT_PURE; public: pkgCache::Package **List; diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 2b2a35637..682be0a19 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -12,7 +12,7 @@ #include <apti18n.h> /*}}}*/ -static bool strcmp_match_in_list(char const * const Cmd, ...) /*{{{*/ +APT_SENTINEL static bool strcmp_match_in_list(char const * const Cmd, ...) /*{{{*/ { va_list args; bool found = false; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 0860ee7bf..84b775390 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1118,7 +1118,7 @@ static bool Dotty(CommandLine &CmdL) /* This displays the package record from the proper package index file. It is not used by DumpAvail for performance reasons. */ -static unsigned char const* skipDescriptionFields(unsigned char const * DescP) +static APT_PURE unsigned char const* skipDescriptionFields(unsigned char const * DescP) { char const * const TagName = "\nDescription"; size_t const TagLen = strlen(TagName); diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index facb6002b..b7447463d 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -98,7 +98,7 @@ bool pkgCdromTextStatus::ChangeCdrom() return true; } -OpProgress* pkgCdromTextStatus::GetOpProgress() +APT_CONST OpProgress* pkgCdromTextStatus::GetOpProgress() { return &Progress; } diff --git a/methods/ftp.h b/methods/ftp.h index 119d0c7e8..dd92f0086 100644 --- a/methods/ftp.h +++ b/methods/ftp.h @@ -78,7 +78,7 @@ class FtpMethod : public pkgAcqMethod static std::string FailFile; static int FailFd; static time_t FailTime; - static void SigTerm(int); + static APT_NORETURN void SigTerm(int); public: diff --git a/methods/http.cc b/methods/http.cc index 82f16e9b2..ed6e3517d 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -470,7 +470,7 @@ bool HttpServerState::WriteResponse(const std::string &Data) /*{{{*/ return Out.Read(Data); } /*}}}*/ -bool HttpServerState::IsOpen() /*{{{*/ +APT_PURE bool HttpServerState::IsOpen() /*{{{*/ { return (ServerFd != -1); } @@ -485,7 +485,7 @@ bool HttpServerState::InitHashes(FileFd &File) /*{{{*/ return In.Hash->AddFD(File, StartPos); } /*}}}*/ -Hashes * HttpServerState::GetHashes() /*{{{*/ +APT_PURE Hashes * HttpServerState::GetHashes() /*{{{*/ { return In.Hash; } diff --git a/methods/rsh.h b/methods/rsh.h index c2c06acfe..dd259e744 100644 --- a/methods/rsh.h +++ b/methods/rsh.h @@ -64,7 +64,7 @@ class RSHMethod : public pkgAcqMethod static std::string FailFile; static int FailFd; static time_t FailTime; - static void SigTerm(int); + static APT_NORETURN void SigTerm(int); public: diff --git a/methods/server.h b/methods/server.h index d1e151f8a..0f45ab994 100644 --- a/methods/server.h +++ b/methods/server.h @@ -129,7 +129,7 @@ class ServerMethod : public pkgAcqMethod static std::string FailFile; static int FailFd; static time_t FailTime; - static void SigTerm(int); + static APT_NORETURN void SigTerm(int); virtual bool Configuration(std::string Message); virtual bool Flush() { return Server->Flush(File); }; diff --git a/test/libapt/assert.h b/test/libapt/assert.h index cde6a6351..357801592 100644 --- a/test/libapt/assert.h +++ b/test/libapt/assert.h @@ -1,6 +1,8 @@ #include <iostream> #include <cstdlib> +#include <apt-pkg/macros.h> + #if __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wmissing-declarations" @@ -10,7 +12,7 @@ #define equalsNot(x,y) assertEqualsNot(y, x, __LINE__) template < typename X, typename Y > -void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { +APT_NORETURN void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl; std::exit(EXIT_FAILURE); } -- cgit v1.2.3 From 500dc0700136092692d1cceba4e5c1639bcfc825 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Mar 2014 01:31:55 +0100 Subject: use SPtrArray handling instead of explicit delete[] The warning message from gcc doesn't make that much sense in my reading as there is no loop which could overflow here, but it is better to use our SPtrArray wrapping anyway which fixes the warning as well. warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] delete[] Dsc; Git-Dch: Ignore Reported-By: gcc -Wunsafe-loop-optimizations --- cmdline/apt-get.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a830c2387..caf69da2a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -741,7 +741,7 @@ static bool DoSource(CommandLine &CmdL) pkgAcquire Fetcher; Fetcher.SetLog(&Stat); - DscFile *Dsc = new DscFile[CmdL.FileSize()]; + SPtrArray<DscFile> Dsc = new DscFile[CmdL.FileSize()]; // insert all downloaded uris into this set to avoid downloading them // twice @@ -762,7 +762,6 @@ static bool DoSource(CommandLine &CmdL) pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache); if (Last == 0) { - delete[] Dsc; return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); } @@ -796,7 +795,6 @@ static bool DoSource(CommandLine &CmdL) // Back track vector<pkgSrcRecords::File> Lst; if (Last->Files(Lst) == false) { - delete[] Dsc; return false; } @@ -859,7 +857,6 @@ static bool DoSource(CommandLine &CmdL) struct statvfs Buf; string OutputDir = "."; if (statvfs(OutputDir.c_str(),&Buf) != 0) { - delete[] Dsc; if (errno == EOVERFLOW) return _error->WarningE("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); @@ -874,7 +871,6 @@ static bool DoSource(CommandLine &CmdL) || unsigned(Stat.f_type) != RAMFS_MAGIC #endif ) { - delete[] Dsc; return _error->Error(_("You don't have enough free space in %s"), OutputDir.c_str()); } @@ -896,7 +892,6 @@ static bool DoSource(CommandLine &CmdL) { for (unsigned I = 0; I != J; I++) ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str()); - delete[] Dsc; return true; } @@ -907,7 +902,6 @@ static bool DoSource(CommandLine &CmdL) for (; I != Fetcher.UriEnd(); ++I) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; - delete[] Dsc; return true; } @@ -915,14 +909,12 @@ static bool DoSource(CommandLine &CmdL) bool Failed = false; if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true) { - delete[] Dsc; return _error->Error(_("Failed to fetch some archives.")); } if (_config->FindB("APT::Get::Download-only",false) == true) { c1out << _("Download complete and in download only mode") << endl; - delete[] Dsc; return true; } @@ -996,7 +988,6 @@ static bool DoSource(CommandLine &CmdL) _exit(0); } - delete[] Dsc; // Wait for the subprocess int Status = 0; -- cgit v1.2.3 From 9d9d5e810751954594c793383b07ca526c647350 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 6 Mar 2014 02:36:48 +0100 Subject: enable various compiler warnings Now that the last few commits resolved the issues we can finally enable a bunch of compiler warnings by default. Git-Dch: ignore --- buildlib/environment.mak.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index fc859951e..9cc449573 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -7,9 +7,13 @@ PACKAGE_MAIL = @PACKAGE_MAIL@ # C++ compiler options CC = @CC@ -CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall +CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -D_FORTIFY_SOURCE=2 CXX = @CXX@ -CXXFLAGS+= @CXXFLAGS@ +CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra +CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations +CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn +# a bit too pedantic to be run by default +#CXXFLAGS+= -Wpedantic -Wno-long-long -Wno-vla -Wno-variadic-macros NUM_PROCS = @NUM_PROCS@ # Linker stuff @@ -68,4 +72,3 @@ else # Do not know how to create shared libraries here. ONLYSTATICLIBS = yes endif - -- cgit v1.2.3 From 0caa5a4c6472d1b74444c4f38ced6c3b89fa50fe Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 8 Mar 2014 17:29:46 +0100 Subject: do not configure already unpacked packages needlessly The unpack of a M-A:same package will force the unpack of all its siblings directly to prevent that they could be separated by later immediate actions. In commit 634985f8 a call to SmartConfigure was introduced to configure these packages at the time the installation order encounters them. Usually, the unpack order is already okay, so that this 'earlier' unpack was not needed and if it wouldn't have been done, the package would now only be unpacked, but by configuring the package now we impose new requirements which must be satisfied. The code is clever enough to handle this most of the time (it worked for 2 years!), but it isn't needed and in very coupled cases this can fail. Removing this call again removes this extra burden and so simplifies the ordering as can be seen in the modified tests. Famous last words, but I don't see a reason for this extra burden to exist hence the remove. Closes: 740843 --- apt-pkg/packagemanager.cc | 17 +++---- test/integration/framework | 14 ++++-- .../test-bug-740843-versioned-up-down-breaks | 55 ++++++++++++++++++++++ test/integration/test-bug-multiarch-upgrade | 4 +- .../test-ignore-provides-if-versioned-breaks | 4 +- .../test-ignore-provides-if-versioned-conflicts | 4 +- ...prevent-markinstall-multiarch-same-versionscrew | 8 ++-- ...ight-loop-configure-with-unpacking-new-packages | 4 +- 8 files changed, 82 insertions(+), 28 deletions(-) create mode 100755 test/integration/test-bug-740843-versioned-up-down-breaks diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 4d08fb3ba..5d6bc6bd2 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -622,6 +622,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")"; if (PkgLoop) clog << " (Only Perform PreUnpack Checks)"; + if (Immediate) + clog << " immediately"; clog << endl; } @@ -963,21 +965,14 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I) { PkgIterator Pkg(Cache,*I); - + if (List->IsNow(Pkg) == false) { - if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) { - if (SmartConfigure(Pkg, 0) == false && Debug) - _error->Warning("Internal Error, Could not configure %s",Pkg.FullName().c_str()); - // FIXME: The above warning message might need changing - } else { - if (Debug == true) - clog << "Skipping already done " << Pkg.FullName() << endl; - } + if (Debug == true) + clog << "Skipping already done " << Pkg.FullName() << endl; continue; - } - + if (List->IsMissing(Pkg) == true) { if (Debug == true) diff --git a/test/integration/framework b/test/integration/framework index 83deafe88..d66171783 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1010,11 +1010,15 @@ testequalor2() { shift 2 msgtest "Test for equality OR of" "$*" $* >$COMPAREAGAINST 2>&1 || true - (checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null || - checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass || - ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(checkdiff $COMPAREFILE1 $COMPAREAGAINST)" \ - "\n${CINFO}Diff against OR 2${CNORMAL}" "$(checkdiff $COMPAREFILE2 $COMPAREAGAINST)" && - msgfail ) + if checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null || checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null; then + msgpass + else + echo -n "\n${CINFO}Diff against OR 1${CNORMAL}" + checkdiff $COMPAREFILE1 $COMPAREAGAINST || true + echo -n "${CINFO}Diff against OR 2${CNORMAL}" + checkdiff $COMPAREFILE2 $COMPAREAGAINST || true + msgfail + fi } testshowvirtual() { diff --git a/test/integration/test-bug-740843-versioned-up-down-breaks b/test/integration/test-bug-740843-versioned-up-down-breaks new file mode 100755 index 000000000..cb035a71f --- /dev/null +++ b/test/integration/test-bug-740843-versioned-up-down-breaks @@ -0,0 +1,55 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertinstalledpackage 'foo-driver' 'amd64' '1' 'Depends: libfoo (= 1) +Recommends: libgl1-foo-glx (= 1) +Breaks: libgl1-foo-glx (<< 1), libgl1-foo-glx (>> 1)' +insertinstalledpackage 'libgl1-foo-glx' 'amd64,i386' '1' 'Depends: libfoo (= 1) +Multi-Arch: same' +insertinstalledpackage 'libfoo' 'amd64,i386' '1' 'Multi-Arch: same' + +buildsimplenativepackage 'foo-driver' 'amd64' '2' 'stable' 'Depends: libfoo (= 2) +Recommends: libgl1-foo-glx (= 2) +Breaks: libgl1-foo-glx (<< 2), libgl1-foo-glx (>> 2)' +buildsimplenativepackage 'libgl1-foo-glx' 'amd64,i386' '2' 'stable' 'Depends: libfoo (= 2) +Multi-Arch: same' +buildsimplenativepackage 'libfoo' 'amd64,i386' '2' 'stable' 'Multi-Arch: same' + +setupaptarchive + +testequalor2 'Reading package lists... +Building dependency tree... +The following packages will be upgraded: + foo-driver libfoo libfoo:i386 libgl1-foo-glx libgl1-foo-glx:i386 +5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst libgl1-foo-glx [1] (2 stable [amd64]) [libgl1-foo-glx:amd64 on libgl1-foo-glx:i386] [libgl1-foo-glx:i386 on libgl1-foo-glx:amd64] [foo-driver:amd64 on libgl1-foo-glx:amd64] [libgl1-foo-glx:i386 foo-driver:amd64 ] +Inst libgl1-foo-glx:i386 [1] (2 stable [i386]) [foo-driver:amd64 on libgl1-foo-glx:amd64] [foo-driver:amd64 on libgl1-foo-glx:i386] [foo-driver:amd64 ] +Inst foo-driver [1] (2 stable [amd64]) [] +Inst libfoo:i386 [1] (2 stable [i386]) [libfoo:amd64 on libfoo:i386] [libfoo:i386 on libfoo:amd64] [libfoo:amd64 ] +Inst libfoo [1] (2 stable [amd64]) +Conf libfoo:i386 (2 stable [i386]) +Conf libfoo (2 stable [amd64]) +Conf libgl1-foo-glx:i386 (2 stable [i386]) +Conf libgl1-foo-glx (2 stable [amd64]) +Conf foo-driver (2 stable [amd64])' 'Reading package lists... +Building dependency tree... +The following packages will be upgraded: + foo-driver libfoo libfoo:i386 libgl1-foo-glx libgl1-foo-glx:i386 +5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst libgl1-foo-glx [1] (2 stable [amd64]) [foo-driver:amd64 on libgl1-foo-glx:amd64] [libgl1-foo-glx:amd64 on libgl1-foo-glx:i386] [libgl1-foo-glx:i386 on libgl1-foo-glx:amd64] [foo-driver:amd64 libgl1-foo-glx:i386 ] +Inst libgl1-foo-glx:i386 [1] (2 stable [i386]) [foo-driver:amd64 on libgl1-foo-glx:amd64] [foo-driver:amd64 on libgl1-foo-glx:i386] [foo-driver:amd64 ] +Inst foo-driver [1] (2 stable [amd64]) [] +Inst libfoo:i386 [1] (2 stable [i386]) [libfoo:amd64 on libfoo:i386] [libfoo:i386 on libfoo:amd64] [libfoo:amd64 ] +Inst libfoo [1] (2 stable [amd64]) +Conf libfoo:i386 (2 stable [i386]) +Conf libfoo (2 stable [amd64]) +Conf libgl1-foo-glx:i386 (2 stable [i386]) +Conf libgl1-foo-glx (2 stable [amd64]) +Conf foo-driver (2 stable [amd64])' aptget dist-upgrade -s + +testsuccess aptget dist-upgrade -y -o Debug::pkgPackageManager=1 -o Debug::pkgOrderList=1 diff --git a/test/integration/test-bug-multiarch-upgrade b/test/integration/test-bug-multiarch-upgrade index dc3725df1..c29e1f903 100755 --- a/test/integration/test-bug-multiarch-upgrade +++ b/test/integration/test-bug-multiarch-upgrade @@ -25,5 +25,5 @@ The following packages will be upgraded: 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. Inst libcups2 [1] (2 unstable [amd64]) [libcups2:amd64 on libcups2:i386] [libcups2:i386 on libcups2:amd64] [libcups2:i386 ] Inst libcups2:i386 [1] (2 unstable [i386]) -Conf libcups2 (2 unstable [amd64]) -Conf libcups2:i386 (2 unstable [i386])' aptget install -s libcups2:i386 +Conf libcups2:i386 (2 unstable [i386]) +Conf libcups2 (2 unstable [amd64])' aptget install -s libcups2:i386 diff --git a/test/integration/test-ignore-provides-if-versioned-breaks b/test/integration/test-ignore-provides-if-versioned-breaks index f8b4544a0..745f7d206 100755 --- a/test/integration/test-ignore-provides-if-versioned-breaks +++ b/test/integration/test-ignore-provides-if-versioned-breaks @@ -142,9 +142,9 @@ The following packages will be upgraded: 2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded. Inst foo-same:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386 ] Inst foo-same [2.0] (4.0 unstable [i386]) -Conf foo-same:amd64 (4.0 unstable [amd64]) -Conf foo-same (4.0 unstable [i386]) Inst foo-same-breaker-3 (1.0 unstable [i386]) Inst foo-same-provider (1.0 unstable [i386]) +Conf foo-same (4.0 unstable [i386]) +Conf foo-same:amd64 (4.0 unstable [amd64]) Conf foo-same-breaker-3 (1.0 unstable [i386]) Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts index 44eafcff1..a07252768 100755 --- a/test/integration/test-ignore-provides-if-versioned-conflicts +++ b/test/integration/test-ignore-provides-if-versioned-conflicts @@ -142,9 +142,9 @@ The following packages will be upgraded: 2 upgraded, 2 newly installed, 0 to remove and 2 not upgraded. Inst foo-same:amd64 [2.0] (4.0 unstable [amd64]) [foo-same:amd64 on foo-same:i386] [foo-same:i386 on foo-same:amd64] [foo-same:i386 ] Inst foo-same [2.0] (4.0 unstable [i386]) -Conf foo-same:amd64 (4.0 unstable [amd64]) -Conf foo-same (4.0 unstable [i386]) Inst foo-same-breaker-3 (1.0 unstable [i386]) Inst foo-same-provider (1.0 unstable [i386]) +Conf foo-same (4.0 unstable [i386]) +Conf foo-same:amd64 (4.0 unstable [amd64]) Conf foo-same-breaker-3 (1.0 unstable [i386]) Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s diff --git a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew index fed12dad0..d647856cb 100755 --- a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew +++ b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew @@ -55,14 +55,14 @@ Remv out-of-sync-gone-foreign:i386 [1] Remv out-of-sync-gone-native [1] Inst fine [1] (2 unstable [amd64]) [fine:amd64 on fine:i386] [fine:i386 on fine:amd64] [fine:i386 ] Inst fine:i386 [1] (2 unstable [i386]) -Conf fine (2 unstable [amd64]) -Conf fine:i386 (2 unstable [i386]) Inst fine-installed [1] (2 unstable [amd64]) [fine-installed:amd64 on fine-installed:i386] [fine-installed:i386 on fine-installed:amd64] [fine-installed:i386 ] Inst fine-installed:i386 [1] (2 unstable [i386]) -Conf fine-installed (2 unstable [amd64]) -Conf fine-installed:i386 (2 unstable [i386]) Inst out-of-sync-gone-foreign [1] (2 unstable [amd64]) Inst out-of-sync-gone-native:i386 [1] (2 unstable [i386]) +Conf fine:i386 (2 unstable [i386]) +Conf fine (2 unstable [amd64]) +Conf fine-installed:i386 (2 unstable [i386]) +Conf fine-installed (2 unstable [amd64]) Conf out-of-sync-gone-foreign (2 unstable [amd64]) Conf out-of-sync-gone-native:i386 (2 unstable [i386])' aptget dist-upgrade -s #-o Debug::pkgDepCache::Marker=1 diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages index 5856cd744..c1d454f88 100755 --- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages +++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages @@ -39,9 +39,9 @@ Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-core:amd64 on libreoffice Inst libreoffice-common [3] (4 sid [all]) [] Inst ure (4 sid [amd64]) Conf ure (4 sid [amd64]) -Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice-common (4 sid [all]) Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' 'Reading package lists... Building dependency tree... The following NEW packages will be installed: @@ -55,7 +55,7 @@ Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffi Inst libreoffice-common [3] (4 sid [all]) [] Inst ure (4 sid [amd64]) Conf ure (4 sid [amd64]) -Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice-common (4 sid [all]) Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s -- cgit v1.2.3 From 1e071c30340ef6b0f8279440a9fd369f27e9b34b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 8 Mar 2014 17:42:11 +0100 Subject: simplify apt-cdrom testcode Git-Dch: Ignore --- test/integration/test-apt-cdrom | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index cc3483f9b..caaa351c0 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -24,9 +24,13 @@ cd - > /dev/null addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom/dists/;" chmod -R -w rootdir/media/cdrom/dists -aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1 -sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log -testfileequal apt-cdrom.log "Scanning disc for index files.. +aptcdromlog() { + rm -f rootdir/tmp/apt-cdrom.log + aptcdrom "$@" -o quiet=1 >rootdir/tmp/apt-cdrom.log 2>&1 + sed -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log +} + +testequal "Scanning disc for index files.. Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures Found label 'Debian APT Testdisk 0.8.15' This disc is called: @@ -35,7 +39,9 @@ Writing new source list Source list entries for this disc are: deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." +Repeat this process for the rest of the CDs in your set." aptcdromlog add -m + +testequal 'Stored label: Debian APT Testdisk 0.8.15' aptcdromlog ident -m testequal 'Reading package lists... Building dependency tree... @@ -54,9 +60,7 @@ Inst testing:i386 (0.8.15 stable [i386]) Conf testing:i386 (0.8.15 stable [i386])' aptget install testing:i386 -s # check Idempotence of apt-cdrom (and disabling of Translation dropping) -aptcdrom add -m -o quiet=1 -o APT::CDROM::DropTranslation=0 > apt-cdrom.log 2>&1 -sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log -testfileequal apt-cdrom.log "Scanning disc for index files.. +testequal "Scanning disc for index files.. Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures This disc is called: 'Debian APT Testdisk 0.8.15' @@ -64,12 +68,10 @@ Writing new source list Source list entries for this disc are: deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." +Repeat this process for the rest of the CDs in your set." aptcdromlog add -m -o APT::CDROM::DropTranslation=0 # take Translations from previous runs as needed -aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1 -sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log -testfileequal apt-cdrom.log "Scanning disc for index files.. +testequal "Scanning disc for index files.. Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures This disc is called: 'Debian APT Testdisk 0.8.15' @@ -77,14 +79,12 @@ Writing new source list Source list entries for this disc are: deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." +Repeat this process for the rest of the CDs in your set." aptcdromlog add -m msgtest 'Test for the german description translation of' 'testing' aptcache show testing -o Acquire::Languages=de | grep -q '^Description-de: ' && msgpass || msgfail rm -rf rootdir/var/lib/apt/lists mkdir -p rootdir/var/lib/apt/lists/partial -aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1 -sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log -testfileequal apt-cdrom.log "Scanning disc for index files.. +testequal "Scanning disc for index files.. Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures This disc is called: 'Debian APT Testdisk 0.8.15' @@ -92,7 +92,7 @@ Writing new source list Source list entries for this disc are: deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." +Repeat this process for the rest of the CDs in your set." aptcdromlog add -m msgtest 'Test for the english description translation of' 'testing' aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' && msgpass || msgfail -- cgit v1.2.3 From 79bde56ea93b396e509fff0ad7a490f949aa5aa4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sun, 9 Mar 2014 13:32:07 +0100 Subject: if mountpoint has a ".disk" directory it is mounted Checking that parent-directory of mountpoint and mountpoint are on different devices is fine most of the time, but is too restrictive for our testcases and there shouldn't be anything wrong with 'normal' users copying disk-contents around either if they want to. We check for the existance of the ".disk/" directory now as this will not be present if the disk isn't 'mounted'. Disks doesn't need to have such a directory through, so for those we fall back to the old way of detecting mounted or not mounted. --- apt-pkg/contrib/cdromutl.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 096d3bcf5..176cc2024 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -45,11 +45,16 @@ bool IsMounted(string &Path) { if (Path.empty() == true) return false; - + // Need that trailing slash for directories if (Path[Path.length() - 1] != '/') Path += '/'; - + + // if the path has a ".disk" directory we treat it as mounted + // this way even extracted copies of disks are recognized + if (DirectoryExists(Path + ".disk/") == true) + return true; + /* First we check if the path is actually mounted, we do this by stating the path and the previous directory (careful of links!) and comparing their device fields. */ -- cgit v1.2.3 From 454b97a57ff3b7ced87ac359658adecaae7af7ee Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sun, 9 Mar 2014 14:38:07 +0100 Subject: no error for non-existing mountpoints in MountCdrom The mountpoint might be auto-generated by the mount command so pushing an error on the stack will confuse the following code and let it believe an unrecoverable error occured while potentially everything is okay. Same goes for umount as a non-existing mountpoint is by definition not mounted. --- apt-pkg/contrib/cdromutl.cc | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 176cc2024..f850e08a5 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -74,7 +74,13 @@ bool IsMounted(string &Path) leave /etc/mtab inconsitant. We drop all messages this produces. */ bool UnmountCdrom(string Path) { - if (IsMounted(Path) == false) + // do not generate errors, even if the mountpoint does not exist + // the mountpoint might be auto-created by the mount command + // and a non-existing mountpoint is surely not mounted + _error->PushToStack(); + bool const mounted = IsMounted(Path); + _error->RevertToStack(); + if (mounted == false) return true; for (int i=0;i<3;i++) @@ -86,8 +92,9 @@ bool UnmountCdrom(string Path) if (Child == 0) { // Make all the fds /dev/null - for (int I = 0; I != 3; I++) - dup2(open("/dev/null",O_RDWR),I); + int const null_fd = open("/dev/null",O_RDWR); + for (int I = 0; I != 3; ++I) + dup2(null_fd, I); if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true) { @@ -121,19 +128,24 @@ bool UnmountCdrom(string Path) /* We fork mount and drop all messages */ bool MountCdrom(string Path, string DeviceName) { - if (IsMounted(Path) == true) + // do not generate errors, even if the mountpoint does not exist + // the mountpoint might be auto-created by the mount command + _error->PushToStack(); + bool const mounted = IsMounted(Path); + _error->RevertToStack(); + if (mounted == true) return true; - + int Child = ExecFork(); // The child if (Child == 0) { // Make all the fds /dev/null - int null_fd = open("/dev/null",O_RDWR); - for (int I = 0; I != 3; I++) + int const null_fd = open("/dev/null",O_RDWR); + for (int I = 0; I != 3; ++I) dup2(null_fd, I); - + if (_config->Exists("Acquire::cdrom::"+Path+"::Mount") == true) { if (system(_config->Find("Acquire::cdrom::"+Path+"::Mount").c_str()) != 0) -- cgit v1.2.3 From b374004b8ffebe393c5fd5e8056f7a99849c0ebd Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 00:09:56 +0100 Subject: apt-cdrom ident shouldn't be interactive Commit 62dcbf84 changed the code of ident to look more like the code for add on my suggestion. This made ident interactive as it starts with a unmount, press enter, mount cycle. The first two are skipped now. This fixes d-i/apt-setup which is using it to get ID as well as label. Closes: 740673 --- apt-pkg/cdrom.cc | 27 +++++++++++++++------------ apt-pkg/cdrom.h | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 262ff9eab..dd6d51e97 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -563,7 +563,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source) return true; } /*}}}*/ -bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log)/*{{{*/ +bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log, bool const interactive)/*{{{*/ { // Startup CDROM = _config->FindDir("Acquire::cdrom::mount"); @@ -581,16 +581,19 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s // Unmount the CD and get the user to put in the one they want if (_config->FindB("APT::CDROM::NoMount", false) == false) { - if(log != NULL) - log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); - UnmountCdrom(CDROM); - - if(log != NULL) + if (interactive == true) { - log->Update(_("Waiting for disc...\n"), STEP_WAIT); - if(!log->ChangeCdrom()) { - // user aborted - return false; + if(log != NULL) + log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); + UnmountCdrom(CDROM); + + if(log != NULL) + { + log->Update(_("Waiting for disc...\n"), STEP_WAIT); + if(!log->ChangeCdrom()) { + // user aborted + return false; + } } } @@ -636,7 +639,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ { Configuration Database; std::string CDROM; - if (MountAndIdentCDROM(Database, CDROM, ident, log) == false) + if (MountAndIdentCDROM(Database, CDROM, ident, log, false) == false) return false; if (log != NULL) @@ -662,7 +665,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ { Configuration Database; std::string ID, CDROM; - if (MountAndIdentCDROM(Database, CDROM, ID, log) == false) + if (MountAndIdentCDROM(Database, CDROM, ID, log, true) == false) return false; if(log != NULL) diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index f4a873808..0ed4a6a73 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -74,7 +74,7 @@ class pkgCdrom /*{{{*/ private: bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, - std::string &ident, pkgCdromStatus * const log); + std::string &ident, pkgCdromStatus * const log, bool const interactive); }; /*}}}*/ -- cgit v1.2.3 From b5ee78aec0b13932bdeb710cbbea148b7041203a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 00:33:38 +0100 Subject: remove code duplication for Add & Ident in apt-cdrom The preparation code to deal with auto-detection and co is the same for both methods, so not sharing them would be bad. Deals also with the prevention of side effects triggered by the auto-detection like disabling mounting for the fallback. Git-Dch: Ignore --- cmdline/apt-cdrom.cc | 202 +++++++++++++++++++++------------------------------ 1 file changed, 81 insertions(+), 121 deletions(-) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index b7447463d..53efe65b8 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -34,12 +34,6 @@ #include <apti18n.h> /*}}}*/ -static const char *W_NO_CDROM_FOUND = \ - N_("No CD-ROM could be auto-detected or found using " - "the default mount point.\n" - "You may try the --cdrom option to set the CD-ROM mount point. " - "See 'man apt-cdrom' for more " - "information about the CD-ROM auto-detection and mount point."); using namespace std; @@ -103,143 +97,111 @@ APT_CONST OpProgress* pkgCdromTextStatus::GetOpProgress() return &Progress; } /*}}}*/ -// SetupAutoDetect /*{{{*/ -static bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted) +// AddOrIdent - Add or Ident a CDROM /*{{{*/ +static bool AddOrIdent(bool const Add) { - bool Debug = _config->FindB("Debug::Acquire::cdrom", false); + pkgUdevCdromDevices UdevCdroms; + pkgCdromTextStatus log; + pkgCdrom cdrom; - automounted = false; + bool oneSuccessful = false; + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); + if (AutoDetect == true && UdevCdroms.Dlopen() == true) + { + bool const Debug = _config->FindB("Debug::Acquire::cdrom", false); + std::string const CDMount = _config->Find("Acquire::cdrom::mount"); + bool const NoMount = _config->FindB("APT::CDROM::NoMount", false); + if (NoMount == false) + _config->Set("APT::CDROM::NoMount", true); + + vector<struct CdromDevice> const v = UdevCdroms.Scan(); + for (std::vector<struct CdromDevice>::const_iterator cd = v.begin(); cd != v.end(); ++cd) + { + if (Debug) + clog << "Looking at device:" + << "\tDeviveName: '" << cd->DeviceName << "'" + << "\tIsMounted: '" << cd->Mounted << "'" + << "\tMountPoint: '" << cd->MountPath << "'" + << endl; + + std::string AptMountPoint; + if (cd->Mounted) + _config->Set("Acquire::cdrom::mount", cd->MountPath); + else if (NoMount == true) + continue; + else + { + AptMountPoint = _config->FindDir("Dir::Media::MountPath"); + if (FileExists(AptMountPoint) == false) + mkdir(AptMountPoint.c_str(), 0750); + if(MountCdrom(AptMountPoint, cd->DeviceName) == false) + { + _error->Warning(_("Failed to mount '%s' to '%s'"), cd->DeviceName.c_str(), AptMountPoint.c_str()); + continue; + } + _config->Set("Acquire::cdrom::mount", AptMountPoint); + } - vector<struct CdromDevice> v = UdevCdroms.Scan(); - if (i >= v.size()) - return false; + _error->PushToStack(); + if (Add == true) + oneSuccessful = cdrom.Add(&log); + else + { + std::string id; + oneSuccessful = cdrom.Ident(id, &log); + } + _error->MergeWithStack(); - if (Debug) - clog << "Looking at devce " << i - << " DeviveName: " << v[i].DeviceName - << " IsMounted: '" << v[i].Mounted << "'" - << " MountPoint: '" << v[i].MountPath << "'" - << endl; + if (AptMountPoint.empty() == false) + UnmountCdrom(AptMountPoint); + } + if (NoMount == false) + _config->Set("APT::CDROM::NoMount", NoMount); + _config->Set("Acquire::cdrom::mount", CDMount); + } - if (v[i].Mounted) + // fallback if auto-detect didn't work + if (oneSuccessful == false) { - // set the right options - _config->Set("Acquire::cdrom::mount", v[i].MountPath); - _config->Set("APT::CDROM::NoMount", true); - } else { - string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); - if (!FileExists(AptMountPoint)) - mkdir(AptMountPoint.c_str(), 0750); - if(MountCdrom(AptMountPoint, v[i].DeviceName) == false) - _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str()); + _error->PushToStack(); + if (Add == true) + oneSuccessful = cdrom.Add(&log); else - automounted = true; - _config->Set("Acquire::cdrom::mount", AptMountPoint); - _config->Set("APT::CDROM::NoMount", true); + { + std::string id; + oneSuccessful = cdrom.Ident(id, &log); + } + _error->MergeWithStack(); } - i++; - return true; + if (oneSuccessful == false) + _error->Error("%s", _("No CD-ROM could be auto-detected or found using the default mount point.\n" + "You may try the --cdrom option to set the CD-ROM mount point.\n" + "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and mount point.")); + else if (Add == true) + cout << _("Repeat this process for the rest of the CDs in your set.") << endl; + + return oneSuccessful; } /*}}}*/ // DoAdd - Add a new CDROM /*{{{*/ // --------------------------------------------------------------------- /* This does the main add bit.. We show some status and things. The - sequence is to mount/umount the CD, Ident it then scan it for package + sequence is to mount/umount the CD, Ident it then scan it for package files and reduce that list. Then we copy over the package files and verify them. Then rewrite the database files */ static bool DoAdd(CommandLine &) { - pkgUdevCdromDevices UdevCdroms; - pkgCdromTextStatus log; - pkgCdrom cdrom; - bool res = true; - - bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); - unsigned int count = 0; - string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); - bool automounted = false; - if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count, automounted)) { - if (count == 1) { - // begin loop with res false to detect any success using OR - res = false; - } - - // dump any warnings/errors from autodetect - if (_error->empty() == false) - _error->DumpErrors(); - - res |= cdrom.Add(&log); - - if (automounted) - UnmountCdrom(AptMountPoint); - - // dump any warnings/errors from add/unmount - if (_error->empty() == false) - _error->DumpErrors(); - } - - if (count == 0) - res = cdrom.Add(&log); - - if (res == false) - _error->Error("%s", _(W_NO_CDROM_FOUND)); - else - cout << _("Repeat this process for the rest of the CDs in your set.") << endl; - - return res; + return AddOrIdent(true); } /*}}}*/ // DoIdent - Ident a CDROM /*{{{*/ -// --------------------------------------------------------------------- -/* */ static bool DoIdent(CommandLine &) { - pkgUdevCdromDevices UdevCdroms; - string ident; - pkgCdromTextStatus log; - pkgCdrom cdrom; - bool res = true; - - bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); - - unsigned int count = 0; - string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); - bool automounted = false; - if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count, automounted)) { - if (count == 1) { - // begin loop with res false to detect any success using OR - res = false; - } - - // dump any warnings/errors from autodetect - if (_error->empty() == false) - _error->DumpErrors(); - - res |= cdrom.Ident(ident, &log); - - if (automounted) - UnmountCdrom(AptMountPoint); - - // dump any warnings/errors from add/unmount - if (_error->empty() == false) - _error->DumpErrors(); - } - - if (count == 0) - res = cdrom.Ident(ident, &log); - - if (res == false) - _error->Error("%s", _(W_NO_CDROM_FOUND)); - - return res; + return AddOrIdent(false); } /*}}}*/ // ShowHelp - Show the help screen /*{{{*/ -// --------------------------------------------------------------------- -/* */ static bool ShowHelp(CommandLine &) { ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, @@ -306,14 +268,12 @@ int main(int argc,const char *argv[]) /*{{{*/ _config->Set("quiet","1"); // Match the operation - CmdL.DispatchArg(Cmds); + bool returned = CmdL.DispatchArg(Cmds); - // Print any errors or warnings found during parsing - bool const Errors = _error->PendingError(); if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); else _error->DumpErrors(GlobalError::DEBUG); - return Errors == true ? 100 : 0; + return returned == true ? 0 : 100; } /*}}}*/ -- cgit v1.2.3 From a0975c8d97f06ac116c5cea9a98993817ced0e86 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 00:43:21 +0100 Subject: enable mount support for apt-cdrom in the tests Git-Dch: Ignore --- test/integration/framework | 13 +++++-- test/integration/test-apt-cdrom | 78 ++++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 40 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index d66171783..bf6fa0218 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -932,16 +932,23 @@ connect = 8080 changetocdrom() { mkdir -p rootdir/media/cdrom/.disk local CD="$(readlink -f rootdir/media/cdrom)" - echo "acquire::cdrom::mount \"${CD}\";" > rootdir/etc/apt/apt.conf.d/00cdrom - echo 'acquire::cdrom::autodetect 0;' >> rootdir/etc/apt/apt.conf.d/00cdrom + echo "acquire::cdrom::mount \"${CD}\"; +acquire::cdrom::${CD}/::mount \"mv ${CD}-unmounted ${CD}\"; +acquire::cdrom::${CD}/::umount \"mv ${CD} ${CD}-unmounted\"; +acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom echo -n "$1" > ${CD}/.disk/info if [ ! -d aptarchive/dists ]; then msgdie 'Flat file archive cdroms can not be created currently' return 1 fi - mv aptarchive/dists $CD + mv aptarchive/dists "$CD" ln -s "$(readlink -f ./incoming)" $CD/pool find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list' -delete + # start with an unmounted disk + mv "${CD}" "${CD}-unmounted" + # we don't want the disk to be modifiable + addtrap 'prefix' "chmod -f -R +w $PWD/rootdir/media/cdrom/dists/ $PWD/rootdir/media/cdrom-unmounted/dists/ || true;" + chmod -R -w rootdir/media/cdrom-unmounted/dists } downloadfile() { diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index caaa351c0..fddd26bd9 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -12,36 +12,59 @@ setupaptarchive --no-update changetocdrom 'Debian APT Testdisk 0.8.15' # -de is not in the Release file, but picked up anyway for compatibility -cd rootdir/media/cdrom/dists/stable/main/i18n +cd rootdir/media/cdrom-unmounted/dists/stable/main/i18n +chmod +w . sed -e '/^Description-en:/ d' -e '/^ / d' -e '/^$/ d' Translation-en > Translation-de echo 'Description-de: automatisch generiertes Testpaket testing=0.8.15/stable Diese Pakete sind nur für das testen von APT gedacht, sie erfüllen keinen Zweck auf einem normalen System… ' >> Translation-de compressfile Translation-de -rm Translation-en Translation-de +rm -f Translation-en Translation-de +chmod -R -w . cd - > /dev/null -addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom/dists/;" -chmod -R -w rootdir/media/cdrom/dists aptcdromlog() { rm -f rootdir/tmp/apt-cdrom.log - aptcdrom "$@" -o quiet=1 >rootdir/tmp/apt-cdrom.log 2>&1 - sed -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log + test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!" + test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!" + aptcdrom "$@" -o quiet=1 >rootdir/tmp/apt-cdrom.log 2>&1 </dev/null + sed -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log + test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!" + test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!" } -testequal "Scanning disc for index files.. -Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures -Found label 'Debian APT Testdisk 0.8.15' -This disc is called: +CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/ +Unmounting CD-ROM +Waiting for disc... +Please insert a Disc in the drive and press enter +Mounting CD-ROM... +Scanning disc for index files.." +CDROM_POST="This disc is called: 'Debian APT Testdisk 0.8.15' Writing new source list Source list entries for this disc are: deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." aptcdromlog add -m +Unmounting CD-ROM... +Repeat this process for the rest of the CDs in your set." + +testequal "$CDROM_PRE +Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures +Found label 'Debian APT Testdisk 0.8.15' +$CDROM_POST" aptcdromlog add + +testequal "Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/ +Mounting CD-ROM... +Stored label: Debian APT Testdisk 0.8.15 +Unmounting CD-ROM..." aptcdromlog ident -testequal 'Stored label: Debian APT Testdisk 0.8.15' aptcdromlog ident -m +# apt-setup uses these commands (expect the tr in the id) to find id and label +ident="$(LC_ALL=C aptcdrom ident 2>&1 )" +CD_ID="$(echo "$ident" | grep "^Identifying" | head -n1 | cut -d" " -f2 | tr --delete '[]')" +CD_LABEL="$(echo "$ident" | grep "^Stored label:" | head -n1 | sed "s/^[^:]*: //")" +testequal "CD::${CD_ID} \"${CD_LABEL}\"; +CD::${CD_ID}::Label \"${CD_LABEL}\";" cat rootdir/var/lib/apt/cdroms.list testequal 'Reading package lists... Building dependency tree... @@ -60,43 +83,24 @@ Inst testing:i386 (0.8.15 stable [i386]) Conf testing:i386 (0.8.15 stable [i386])' aptget install testing:i386 -s # check Idempotence of apt-cdrom (and disabling of Translation dropping) -testequal "Scanning disc for index files.. +testequal "$CDROM_PRE Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures -This disc is called: -'Debian APT Testdisk 0.8.15' -Writing new source list -Source list entries for this disc are: -deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main -deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." aptcdromlog add -m -o APT::CDROM::DropTranslation=0 +$CDROM_POST" aptcdromlog add -o APT::CDROM::DropTranslation=0 # take Translations from previous runs as needed -testequal "Scanning disc for index files.. +testequal "$CDROM_PRE Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures -This disc is called: -'Debian APT Testdisk 0.8.15' -Writing new source list -Source list entries for this disc are: -deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main -deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." aptcdromlog add -m +$CDROM_POST" aptcdromlog add msgtest 'Test for the german description translation of' 'testing' aptcache show testing -o Acquire::Languages=de | grep -q '^Description-de: ' && msgpass || msgfail rm -rf rootdir/var/lib/apt/lists mkdir -p rootdir/var/lib/apt/lists/partial -testequal "Scanning disc for index files.. +testequal "$CDROM_PRE Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures -This disc is called: -'Debian APT Testdisk 0.8.15' -Writing new source list -Source list entries for this disc are: -deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main -deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main -Repeat this process for the rest of the CDs in your set." aptcdromlog add -m +$CDROM_POST" aptcdromlog add msgtest 'Test for the english description translation of' 'testing' aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' && msgpass || msgfail - # check that we really can install from a 'cdrom' testdpkgnotinstalled testing testsuccess aptget install testing -y -- cgit v1.2.3 From 12844170ad33d96cb0c5fa411f4eb62fea6e3d5d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 01:49:37 +0100 Subject: support very long mtab entries in mountpoint discovery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Old code limited lines to 250 characters which is probably enough for everybody, but who knows… It also takes care of device nodes which start with the same prefix. --- apt-pkg/contrib/cdromutl.cc | 48 ++++++++++++------------ test/libapt/cdromfindmountpointfordevice_test.cc | 26 +++++++++++++ test/libapt/makefile | 6 +++ test/libapt/run-tests | 8 ++++ 4 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 test/libapt/cdromfindmountpointfordevice_test.cc diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index f850e08a5..936e377fb 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -23,6 +23,7 @@ #include <string.h> #include <iostream> #include <string> +#include <vector> #include <sys/statvfs.h> #include <dirent.h> #include <fcntl.h> @@ -262,37 +263,34 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version) return true; } /*}}}*/ - // FindMountPointForDevice - Find mountpoint for the given device /*{{{*/ string FindMountPointForDevice(const char *devnode) { - char buf[255]; - char *out[10]; - int i=0; - // this is the order that mount uses as well - const char *mount[] = { "/etc/mtab", - "/proc/mount", - NULL }; + std::vector<std::string> const mounts = _config->FindVector("Dir::state::MountPoints", "/etc/mtab,/proc/mount"); - for (i=0; mount[i] != NULL; i++) { - if (FileExists(mount[i])) { - FILE *f=fopen(mount[i], "r"); - while ( fgets(buf, sizeof(buf), f) != NULL) { - if (strncmp(buf, devnode, strlen(devnode)) == 0) { - if(TokSplitString(' ', buf, out, 10)) - { - fclose(f); - // unescape the \0XXX chars in the path - string mount_point = out[1]; - return DeEscapeString(mount_point); - } - } - } - fclose(f); + for (std::vector<std::string>::const_iterator m = mounts.begin(); m != mounts.end(); ++m) + if (FileExists(*m) == true) + { + char * line = NULL; + size_t line_len = 0; + FILE * f = fopen(m->c_str(), "r"); + while(getline(&line, &line_len, f) != -1) + { + char * out[] = { NULL, NULL, NULL }; + TokSplitString(' ', line, out, 3); + if (out[2] != NULL || out[1] == NULL || out[0] == NULL) + continue; + if (strcmp(out[0], devnode) != 0) + continue; + fclose(f); + // unescape the \0XXX chars in the path + string mount_point = out[1]; + return DeEscapeString(mount_point); + } + fclose(f); } - } - + return string(); } /*}}}*/ diff --git a/test/libapt/cdromfindmountpointfordevice_test.cc b/test/libapt/cdromfindmountpointfordevice_test.cc new file mode 100644 index 000000000..26dcd1459 --- /dev/null +++ b/test/libapt/cdromfindmountpointfordevice_test.cc @@ -0,0 +1,26 @@ +#include <config.h> + +#include <apt-pkg/cdromutl.h> +#include <apt-pkg/configuration.h> + +#include <string> +#include <vector> + +#include "assert.h" + +int main(int argc, char const *argv[]) { + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + + _config->Set("Dir::state::Mountpoints", argv[1]); + equals("/", FindMountPointForDevice("rootfs")); + equals("/", FindMountPointForDevice("/dev/disk/by-uuid/fadcbc52-6284-4874-aaaa-dcee1f05fe21")); + equals("/sys", FindMountPointForDevice("sysfs")); + equals("/sys0", FindMountPointForDevice("sysfs0")); + equals("/boot/efi", FindMountPointForDevice("/dev/sda1")); + equals("/tmp", FindMountPointForDevice("tmpfs")); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index a8e053d6e..66d6ea783 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -94,6 +94,12 @@ SLIBS = -lapt-pkg SOURCE = cdromreducesourcelist_test.cc include $(PROGRAM_H) +# test cdroms FindMountPointForDevice for udev autodetection +PROGRAM = CdromFindMountPointForDevice${BASENAME} +SLIBS = -lapt-pkg +SOURCE = cdromfindmountpointfordevice_test.cc +include $(PROGRAM_H) + # test IndexCopy::ConvertToSourceList PROGRAM = IndexCopyToSourceList${BASENAME} SLIBS = -lapt-pkg diff --git a/test/libapt/run-tests b/test/libapt/run-tests index a056f31f9..0baedcf9e 100755 --- a/test/libapt/run-tests +++ b/test/libapt/run-tests @@ -108,6 +108,14 @@ do "${tmppath}/dists/unstable/InRelease" \ "${tmppath}/dists/broken/Release.gpg" ln -s "${tmppath}/dists/unstable" "${tmppath}/dists/sid" + elif [ $name = "CdromFindMountPointForDevice${EXT}" ]; then + tmppath=$(mktemp) + echo 'rootfs / rootfs rw 0 0 +sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0 +sysfs0 /sys0 sysfs rw,nosuid,nodev,noexec,relatime 0 0 +/dev/disk/by-uuid/fadcbc52-6284-4874-aaaa-dcee1f05fe21 / ext4 rw,relatime,errors=remount-ro,data=ordered 0 0 +/dev/sda1 /boot/efi vfat rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro 0 0 +tmpfs /tmp tmpfs rw,nosuid,nodev,relatime 0 0' > $tmppath fi echo -n "Testing with ${NAME} " -- cgit v1.2.3 From 7dcc42611c06cc488bca18be0c7f64d57c7c6e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20G=C3=B3rski?= <wgorski1@gmail.com> Date: Mon, 10 Mar 2014 02:07:05 +0100 Subject: fix polish --install-suggests text in apt-get manpage Description of the --install-suggests option is wrong in the polish apt-get man page. The actual meaning of this option is the opposite to what is written in the manual. Closes: 741056 --- doc/po/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/po/pl.po b/doc/po/pl.po index a5e2a7fa8..981dc676c 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1162,7 +1162,7 @@ msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" -"Nie bierze pod uwagę sugerowanych pakietów jako zależności do instalacji. " +"Uznaje sugerowane pakiety za zależności do instalacji. " "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Suggests</literal>." # -- cgit v1.2.3 From 1166ea79889ecd6c88380f7988182647cf787f8f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 02:54:33 +0100 Subject: msgstr with elipses need three dots fixes some messages and their translation so that all of them have three dots for messages with an elipse. Many translations already had this. --- apt-pkg/cdrom.cc | 6 +++--- apt-private/private-install.cc | 2 +- po/ar.po | 15 +++++---------- po/ast.po | 16 ++++++---------- po/bg.po | 12 ++++-------- po/bs.po | 10 +++------- po/ca.po | 12 ++++-------- po/cs.po | 10 +++------- po/cy.po | 10 +++------- po/da.po | 22 +++++++++------------- po/de.po | 10 +++------- po/dz.po | 14 +++++--------- po/el.po | 10 +++------- po/es.po | 14 +++++--------- po/eu.po | 12 ++++-------- po/fi.po | 10 +++------- po/fr.po | 10 +++------- po/gl.po | 12 ++++-------- po/he.po | 10 +++------- po/hu.po | 10 +++------- po/it.po | 10 +++------- po/ja.po | 14 +++++--------- po/km.po | 14 +++++--------- po/ko.po | 12 ++++-------- po/ku.po | 10 +++------- po/lt.po | 14 +++++--------- po/mr.po | 14 +++++--------- po/nb.po | 14 +++++--------- po/ne.po | 12 ++++-------- po/nl.po | 10 +++------- po/nn.po | 13 ++++--------- po/pl.po | 14 +++++--------- po/pt.po | 16 ++++++---------- po/pt_BR.po | 16 ++++++---------- po/ro.po | 16 ++++++---------- po/ru.po | 14 +++++--------- po/sk.po | 14 +++++--------- po/sl.po | 14 +++++--------- po/sv.po | 18 +++++++----------- po/th.po | 16 ++++++---------- po/tl.po | 15 +++++---------- po/tr.po | 14 +++++--------- po/uk.po | 16 ++++++---------- po/vi.po | 10 +++------- po/zh_CN.po | 14 +++++--------- po/zh_TW.po | 14 +++++--------- test/integration/test-apt-cdrom | 4 ++-- 47 files changed, 205 insertions(+), 384 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index dd6d51e97..2635ede76 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -584,7 +584,7 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s if (interactive == true) { if(log != NULL) - log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); + log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST); UnmountCdrom(CDROM); if(log != NULL) @@ -607,7 +607,7 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s // Hash the CD to get an ID if (log != NULL) - log->Update(_("Identifying.. "), STEP_IDENT); + log->Update(_("Identifying... "), STEP_IDENT); if (IdentCdrom(CDROM,ident) == false) { @@ -669,7 +669,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ return false; if(log != NULL) - log->Update(_("Scanning disc for index files..\n"),STEP_SCAN); + log->Update(_("Scanning disc for index files...\n"),STEP_SCAN); // Get the CD structure vector<string> List; diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 8092af939..107ed398e 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -144,7 +144,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety) if (DebBytes != Cache->DebSize()) { c0out << DebBytes << ',' << Cache->DebSize() << std::endl; - c0out << _("How odd.. The sizes didn't match, email apt@packages.debian.org") << std::endl; + c0out << _("How odd... The sizes didn't match, email apt@packages.debian.org") << std::endl; } // Number of bytes diff --git a/po/ar.po b/po/ar.po index 959f1549f..123e762a7 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1020,8 +1020,8 @@ msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "يا للغرابة... لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -2932,10 +2932,6 @@ msgstr "" msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "فك تركيب القرص المدمج\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "بانتظار القرص...\n" @@ -2945,7 +2941,7 @@ msgid "Mounting CD-ROM...\n" msgstr "تركيب القرص...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "جاري التعرف..." #: apt-pkg/cdrom.cc:643 @@ -2954,12 +2950,11 @@ msgid "Stored label: %s\n" msgstr "" #: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy msgid "Unmounting CD-ROM...\n" -msgstr "فك تركيب القرص المدمج..." +msgstr "فك تركيب القرص المدمج...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "" #: apt-pkg/cdrom.cc:717 diff --git a/po/ast.po b/po/ast.po index 4adfc036a..7e9f8b827 100644 --- a/po/ast.po +++ b/po/ast.po @@ -1129,8 +1129,8 @@ msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun finó" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Que raro.. Los tamaños nun concasen, escribe a apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "Que raro... Los tamaños nun concasen, escribe a apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3161,10 +3161,6 @@ msgstr "El bloque de fornidor %s nun contién una buelga dixital" msgid "Using CD-ROM mount point %s\n" msgstr "Usando el puntu de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Desmontando'l CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Esperando'l discu...\n" @@ -3174,8 +3170,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Montando'l CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identificando.. " +msgid "Identifying... " +msgstr "Identificando... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3184,10 +3180,10 @@ msgstr "Etiqueta guardada: %s\n" #: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando l CD-ROM...\n" +msgstr "Desmontando'l CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Buscando nel discu ficheros d'índices...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/bg.po b/po/bg.po index 2ac50d677..7c30864e8 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1161,9 +1161,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" +"Странно... Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3217,10 +3217,6 @@ msgstr "Блокът на производителя %s не съдържа от msgid "Using CD-ROM mount point %s\n" msgstr "Използване на точка за монтиране на CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Демонтиране на CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Чакане за диск...\n" @@ -3230,7 +3226,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Монтиране на CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Идентифициране..." #: apt-pkg/cdrom.cc:643 @@ -3243,7 +3239,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Демонтиране на CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Сканиране на диска за индексни файлове...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/bs.po b/po/bs.po index a336a4edf..ba1935da2 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1025,7 +1025,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included @@ -2924,10 +2924,6 @@ msgstr "" msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "" - #: apt-pkg/cdrom.cc:588 #, fuzzy msgid "Waiting for disc...\n" @@ -2938,7 +2934,7 @@ msgid "Mounting CD-ROM...\n" msgstr "" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "" #: apt-pkg/cdrom.cc:643 @@ -2952,7 +2948,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Pogrešan CD" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "" #: apt-pkg/cdrom.cc:717 diff --git a/po/ca.po b/po/ca.po index a4779b71a..a30f1fd28 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1148,7 +1148,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org" @@ -3201,10 +3201,6 @@ msgstr "El camp del proveïdor %s no té una empremta digital" msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "S'està desmuntant el CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc…\n" @@ -3214,7 +3210,7 @@ msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM…\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "S'està identificant…" #: apt-pkg/cdrom.cc:643 @@ -3224,10 +3220,10 @@ msgstr "S'ha emmagatzemat l'etiqueta: %s\n" #: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 msgid "Unmounting CD-ROM...\n" -msgstr "S'esta desmuntant el CD-ROM…\n" +msgstr "S'està desmuntant el CD-ROM…\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "S'està analitzant el disc per a fitxers d'índex…\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/cs.po b/po/cs.po index c4f21b056..70b3cde8b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1137,7 +1137,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" @@ -3159,10 +3159,6 @@ msgstr "Blok výrobce %s neobsahuje otisk klíče" msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Odpojuji CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čekám na disk…\n" @@ -3172,7 +3168,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM…\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Rozpoznávám… " #: apt-pkg/cdrom.cc:643 @@ -3185,7 +3181,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Odpojuji CD-ROM…\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Hledám na disku indexové soubory…\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/cy.po b/po/cy.po index 81731354a..6700b0aa1 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1157,7 +1157,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included @@ -3218,10 +3218,6 @@ msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "" - #: apt-pkg/cdrom.cc:588 #, fuzzy msgid "Waiting for disc...\n" @@ -3232,7 +3228,7 @@ msgid "Mounting CD-ROM...\n" msgstr "" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "" #: apt-pkg/cdrom.cc:643 @@ -3246,7 +3242,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "" #: apt-pkg/cdrom.cc:717 diff --git a/po/da.po b/po/da.po index d8d6e1b66..36abe8cd7 100644 --- a/po/da.po +++ b/po/da.po @@ -1171,8 +1171,8 @@ msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "Mystisk... Størrelserne passede ikke, skriv til apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3192,11 +3192,7 @@ msgstr "Leverandørblok %s inderholder intet fingeraftryk" #: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Bruger cdrom-monteringspunktet %s\n" - -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Afmonterer cdrom\n" +msgstr "Bruger CD-ROM-monteringspunktet %s\n" #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" @@ -3204,11 +3200,11 @@ msgstr "Venter på disken ...\n" #: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" -msgstr "Monterer cdrom ...\n" +msgstr "Monterer CD-ROM ...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identificerer .. " +msgid "Identifying... " +msgstr "Identificerer ... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3217,11 +3213,11 @@ msgstr "Gemt mærkat: %s \n" #: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 msgid "Unmounting CD-ROM...\n" -msgstr "Afmonterer cdrom ...\n" +msgstr "Afmonterer CD-ROM ...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Skanner disken for indeksfiler ..\n" +msgid "Scanning disc for index files...\n" +msgstr "Skanner disken for indeksfiler ...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/de.po b/po/de.po index 0ad8cf238..c62f3c9f1 100644 --- a/po/de.po +++ b/po/de.po @@ -1191,7 +1191,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " "eine E-Mail an apt@packages.debian.org (auf Englisch bitte)." @@ -3272,10 +3272,6 @@ msgstr "Herstellerblock %s enthält keinen Fingerabdruck." msgid "Using CD-ROM mount point %s\n" msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Lösen der CD-ROM-Einbindung\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Warten auf Medium ...\n" @@ -3285,7 +3281,7 @@ msgid "Mounting CD-ROM...\n" msgstr "CD-ROM wird eingebunden ...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Identifizieren ... " #: apt-pkg/cdrom.cc:643 @@ -3298,7 +3294,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Einbindung der CD-ROM wird gelöst ...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/dz.po b/po/dz.po index 2bb275d95..2e27d6bcb 100644 --- a/po/dz.po +++ b/po/dz.po @@ -1126,7 +1126,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་ ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་" "བས།" @@ -3143,10 +3143,6 @@ msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ན msgid "Using CD-ROM mount point %s\n" msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོ།\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n" @@ -3156,8 +3152,8 @@ msgid "Mounting CD-ROM...\n" msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "ངོས་འཛིན་འབད་དོ.." +msgid "Identifying... " +msgstr "ངོས་འཛིན་འབད་དོ..." #: apt-pkg/cdrom.cc:643 #, c-format @@ -3170,8 +3166,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n" +msgid "Scanning disc for index files...\n" +msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ...\n" #: apt-pkg/cdrom.cc:717 #, fuzzy, c-format diff --git a/po/el.po b/po/el.po index 8a17a0faf..4d28fdb1d 100644 --- a/po/el.po +++ b/po/el.po @@ -1141,7 +1141,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages." "debian.org" @@ -3175,10 +3175,6 @@ msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει τ msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Αποπροσάρτηση του CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" @@ -3188,7 +3184,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Αναγνώριση..." #: apt-pkg/cdrom.cc:643 @@ -3201,7 +3197,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Αποπροσάρτηση του CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/es.po b/po/es.po index 4345690fe..ee0d55c29 100644 --- a/po/es.po +++ b/po/es.po @@ -1197,9 +1197,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no terminó la ordenación" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Qué raro.. Los tamaños no concuerdan, mande un correo a apt@packages.debian." +"Qué raro... Los tamaños no concuerdan, mande un correo a apt@packages.debian." "org" #. TRANSLATOR: The required space between number and unit is already included @@ -3260,10 +3260,6 @@ msgstr "Bloque de fabricante %s sin huella digital" msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Desmontando el CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" @@ -3273,8 +3269,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identificando.. " +msgid "Identifying... " +msgstr "Identificando... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3286,7 +3282,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Desmontando el CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Buscando en el disco archivos de índices...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/eu.po b/po/eu.po index c54c859f9..a3a81bd6c 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1125,9 +1125,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " +"Hau bitxia... Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " "berri emanez (ingelesez)" #. TRANSLATOR: The required space between number and unit is already included @@ -3142,10 +3142,6 @@ msgstr "%s saltzaile blokeak ez du egiaztapen markarik" msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM-a desmuntatzen\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" @@ -3155,7 +3151,7 @@ msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Egiaztatzen... " #: apt-pkg/cdrom.cc:643 @@ -3168,7 +3164,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM Desmuntatzen...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Indize fitxategien bila diska arakatzen...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/fi.po b/po/fi.po index 78245b153..11c765edf 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1117,7 +1117,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org" @@ -3133,10 +3133,6 @@ msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Irrotetaan romppu\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" @@ -3146,7 +3142,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Tunnistetaan... " #: apt-pkg/cdrom.cc:643 @@ -3159,7 +3155,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Irrotetaan romppu...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/fr.po b/po/fr.po index 5503dadb9..f5a93f9c9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1189,7 +1189,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " "courriel à apt@packages.debian.org." @@ -3292,10 +3292,6 @@ msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cédérom\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Démontage du cédérom\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" @@ -3305,7 +3301,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Montage du cédérom...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Identification..." #: apt-pkg/cdrom.cc:643 @@ -3318,7 +3314,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Démontage du cédérom...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Examen du disque à la recherche de fichiers d'index...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/gl.po b/po/gl.po index 2a03773c2..273347481 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1146,7 +1146,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Produciuse un erro interno; non rematou a ordenación" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que estraño... Os tamaños non coinciden; envíe un correo-e a apt@packages." "debian.org" @@ -3201,10 +3201,6 @@ msgstr "O bloque de provedor %s non contén unha pegada dixital" msgid "Using CD-ROM mount point %s\n" msgstr "Empregando o punto de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Desmontando o CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Agardando polo disco...\n" @@ -3214,7 +3210,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Montando o CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Identificando... " #: apt-pkg/cdrom.cc:643 @@ -3227,8 +3223,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Desmontando o CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Buscando os ficheiros de índices no disco..\n" +msgid "Scanning disc for index files...\n" +msgstr "Buscando os ficheiros de índices no disco...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/he.po b/po/he.po index a2e3cba60..b70ae3b34 100644 --- a/po/he.po +++ b/po/he.po @@ -717,7 +717,7 @@ msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." #: cmdline/apt-get.cc:836 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #: cmdline/apt-get.cc:841 @@ -2604,7 +2604,7 @@ msgid "" msgstr "" #: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 -msgid "Identifying.. " +msgid "Identifying... " msgstr "" #: apt-pkg/cdrom.cc:559 @@ -2621,10 +2621,6 @@ msgstr "" msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:603 -msgid "Unmounting CD-ROM\n" -msgstr "" - #: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "" @@ -2635,7 +2631,7 @@ msgid "Mounting CD-ROM...\n" msgstr "" #: apt-pkg/cdrom.cc:633 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "" #: apt-pkg/cdrom.cc:673 diff --git a/po/hu.po b/po/hu.po index c28b83bfa..06c8efb6b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1159,7 +1159,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem fejeződött be" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre" #. TRANSLATOR: The required space between number and unit is already included @@ -3209,10 +3209,6 @@ msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot" msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM leválasztása\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" @@ -3222,7 +3218,7 @@ msgid "Mounting CD-ROM...\n" msgstr "CD-ROM csatolása...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Azonosítás... " #: apt-pkg/cdrom.cc:643 @@ -3235,7 +3231,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM leválasztása...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Indexfájlok keresése a lemezen...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/it.po b/po/it.po index d15f8f115..b58f1fe10 100644 --- a/po/it.po +++ b/po/it.po @@ -1180,7 +1180,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è stato terminato" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org" @@ -3263,10 +3263,6 @@ msgstr "Il blocco vendor %s non contiene impronte" msgid "Using CD-ROM mount point %s\n" msgstr "Viene usato il punto di mount del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Smontaggio CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" @@ -3276,7 +3272,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Identificazione... " #: apt-pkg/cdrom.cc:643 @@ -3289,7 +3285,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Smontaggio CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Analisi del disco per file indice...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/ja.po b/po/ja.po index 39899be0a..f85224cf9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1160,7 +1160,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" @@ -3197,10 +3197,6 @@ msgstr "ベンダブロック %s は鍵指紋を含んでいません" msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM マウントポイント %s を使用します\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM をアンマウントしています\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "ディスクを待っています ...\n" @@ -3210,8 +3206,8 @@ msgid "Mounting CD-ROM...\n" msgstr "CD-ROM をマウントしています ...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "確認しています.. " +msgid "Identifying... " +msgstr "確認しています... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3223,8 +3219,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM をアンマウントしています ...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "ディスクのインデックスファイルを走査しています ..\n" +msgid "Scanning disc for index files...\n" +msgstr "ディスクのインデックスファイルを走査しています ...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/km.po b/po/km.po index bc7f492b9..f0bb75c19 100644 --- a/po/km.po +++ b/po/km.po @@ -1110,7 +1110,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included @@ -3110,10 +3110,6 @@ msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្ msgid "Using CD-ROM mount point %s\n" msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "កំពុង​រង់ចាំឌីស​...\n" @@ -3123,8 +3119,8 @@ msgid "Mounting CD-ROM...\n" msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. " +msgid "Identifying... " +msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3137,8 +3133,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n" +msgid "Scanning disc for index files...\n" +msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​...\n" #: apt-pkg/cdrom.cc:717 #, fuzzy, c-format diff --git a/po/ko.po b/po/ko.po index f6524c6dc..8b7f9ca86 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1118,7 +1118,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십" "시오." @@ -3131,10 +3131,6 @@ msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM 마운트 해제하는 중입니다\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" @@ -3144,8 +3140,8 @@ msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "알아보는 중입니다.. " +msgid "Identifying... " +msgstr "알아보는 중입니다... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3157,7 +3153,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/ku.po b/po/ku.po index 421f1779f..078e0e745 100644 --- a/po/ku.po +++ b/po/ku.po @@ -1031,7 +1031,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included @@ -2942,10 +2942,6 @@ msgstr "" msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "" @@ -2955,7 +2951,7 @@ msgid "Mounting CD-ROM...\n" msgstr "" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "" #: apt-pkg/cdrom.cc:643 @@ -2968,7 +2964,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "" #: apt-pkg/cdrom.cc:717 diff --git a/po/lt.po b/po/lt.po index b799099b6..362c69c58 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1032,8 +1032,8 @@ msgid "Internal error, Ordering didn't finish" msgstr "" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Keista.. Dydis neatitinka, Parašykite laišką apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "Keista... Dydis neatitinka, Parašykite laišką apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3035,10 +3035,6 @@ msgstr "" msgid "Using CD-ROM mount point %s\n" msgstr "Naudojama CD-ROM prijungimo vieta %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Atjungiamas CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Laukiama disko...\n" @@ -3048,8 +3044,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Prijungiamas CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identifikuojama.. " +msgid "Identifying... " +msgstr "Identifikuojama... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3061,7 +3057,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Atjungiamas CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "" #: apt-pkg/cdrom.cc:717 diff --git a/po/mr.po b/po/mr.po index ea1c478e9..c66fc52ac 100644 --- a/po/mr.po +++ b/po/mr.po @@ -1108,7 +1108,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included @@ -3120,10 +3120,6 @@ msgstr "विक्रेता गट %s मध्ये बोटाचे msgid "Using CD-ROM mount point %s\n" msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "सिडी-रॉम अनमाउंट करत आहे\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n" @@ -3133,8 +3129,8 @@ msgid "Mounting CD-ROM...\n" msgstr "सिडी-रॉम माउंट होत आहे...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "ओळखत आहे.." +msgid "Identifying... " +msgstr "ओळखत आहे..." #: apt-pkg/cdrom.cc:643 #, c-format @@ -3146,8 +3142,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे..\n" +msgid "Scanning disc for index files...\n" +msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/nb.po b/po/nb.po index ff68ac0ca..6edc93013 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1126,7 +1126,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullførte ikke" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Så rart ... Størrelsene stemmer ikke overens, send en e-post til " "apt@packages.debian.org" @@ -3150,10 +3150,6 @@ msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Avmonterer CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Venter på CD-en...\n" @@ -3163,8 +3159,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Indentifiserer.." +msgid "Identifying... " +msgstr "Indentifiserer..." #: apt-pkg/cdrom.cc:643 #, c-format @@ -3176,8 +3172,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Avmonterer CD-ROM ...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Leter gjennom CD for indeksfiler..\n" +msgid "Scanning disc for index files...\n" +msgstr "Leter gjennom CD for indeksfiler...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/ne.po b/po/ne.po index 30b7be69d..59da544fa 100644 --- a/po/ne.po +++ b/po/ne.po @@ -1109,7 +1109,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्" #. TRANSLATOR: The required space between number and unit is already included @@ -3112,10 +3112,6 @@ msgstr "बिक्रता ब्ल्क %s ले कुनै औठा msgid "Using CD-ROM mount point %s\n" msgstr "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "सिडी रोम अनमाउन्ट गरिदैछ\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "डिस्को लागि पर्खिदै...\n" @@ -3125,8 +3121,8 @@ msgid "Mounting CD-ROM...\n" msgstr "सिडी रोम माउन्ट गरिदै...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "परिचय गराइदैछ.." +msgid "Identifying... " +msgstr "परिचय गराइदैछ..." #: apt-pkg/cdrom.cc:643 #, c-format @@ -3139,7 +3135,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/nl.po b/po/nl.po index 48ac54a1b..c68ada677 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1145,7 +1145,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian." "org te mailen" @@ -3202,10 +3202,6 @@ msgstr "Verkopersblok %s bevat geen vingerafdruk" msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "CD wordt losgekoppeld\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" @@ -3215,7 +3211,7 @@ msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Identificatie..." #: apt-pkg/cdrom.cc:643 @@ -3228,7 +3224,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD wordt afgekoppeld...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Er wordt gescand voor indexbestanden...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/nn.po b/po/nn.po index 8b5275196..6409df3fc 100644 --- a/po/nn.po +++ b/po/nn.po @@ -1119,7 +1119,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included @@ -3125,10 +3125,6 @@ msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Avmonterer CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Ventar p disk ...\n" @@ -3138,7 +3134,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Identifiserer ... " #: apt-pkg/cdrom.cc:643 @@ -3147,12 +3143,11 @@ msgid "Stored label: %s\n" msgstr "Lagra etikett: %s \n" #: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ..." +msgstr "Avmonterer CD-ROM ...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Leitar etter indeksfiler p disken ...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/pl.po b/po/pl.po index 40e1016e7..71d03395e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1170,7 +1170,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Błąd wewnętrzny, sortowanie niezakończone" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod " "apt@packages.debian.org" @@ -3231,10 +3231,6 @@ msgstr "Blok producenta %s nie zawiera odcisku" msgid "Using CD-ROM mount point %s\n" msgstr "Użycie %s jako punktu montowania CD-ROM-u\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Odmontowanie CD-ROM-u\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Oczekiwanie na płytę...\n" @@ -3244,8 +3240,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROM-u...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identyfikacja.. " +msgid "Identifying... " +msgstr "Identyfikacja... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3257,8 +3253,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Odmontowanie CD-ROM-u...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n" +msgid "Scanning disc for index files...\n" +msgstr "Skanowanie płyty w poszukiwaniu plików indeksu...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/pt.po b/po/pt.po index 516c18892..c30934820 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1160,9 +1160,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" +"Estranho... Os tamanhos não coincidiram, escreva para apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3221,10 +3221,6 @@ msgstr "O bloco de fabricante %s não contém a impressão digital" msgid "Using CD-ROM mount point %s\n" msgstr "A utilizar o ponto de montagem do CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "A desmontar o CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" @@ -3234,8 +3230,8 @@ msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "A identificar.. " +msgid "Identifying... " +msgstr "A identificar... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3247,8 +3243,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "A desmontar o CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "A pesquisar os ficheiros de índice do disco..\n" +msgid "Scanning disc for index files...\n" +msgstr "A pesquisar os ficheiros de índice do disco...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index a9cff2f35..5aab79c68 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1132,9 +1132,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Que estranho.. Os tamanhos não batem, mande e-mail para apt@packages.debian." +"Que estranho... Os tamanhos não batem, mande e-mail para apt@packages.debian." "org" #. TRANSLATOR: The required space between number and unit is already included @@ -3174,10 +3174,6 @@ msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")" msgid "Using CD-ROM mount point %s\n" msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Desmontando CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Aguardando por disco...\n" @@ -3187,8 +3183,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Montando CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identificando.. " +msgid "Identifying... " +msgstr "Identificando... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3200,8 +3196,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Desmontando CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Procurando por arquivos de índice no disco..\n" +msgid "Scanning disc for index files...\n" +msgstr "Procurando por arquivos de índice no disco...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/ro.po b/po/ro.po index 1fde2d15b..d10785e00 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1134,9 +1134,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Ce ciudat.. Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org" +"Ce ciudat... Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3180,10 +3180,6 @@ msgstr "Blocul vânzător %s nu conține amprentă" msgid "Using CD-ROM mount point %s\n" msgstr "Utilizare punct de montare CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Demontare CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Aștept discul...\n" @@ -3193,8 +3189,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Montez CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identificare.. " +msgid "Identifying... " +msgstr "Identificare... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3206,8 +3202,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Se demontează CD-ul...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Scanez discul de fișierele index..\n" +msgid "Scanning disc for index files...\n" +msgstr "Scanez discul de fișierele index...\n" # DEVELOPERS: please consider using somehow plural forms #: apt-pkg/cdrom.cc:717 diff --git a/po/ru.po b/po/ru.po index 286d558d0..d087cd2b1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1170,7 +1170,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included @@ -3236,10 +3236,6 @@ msgstr "Блок поставщика %s не содержит отпечатк msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Размонтирование CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском…\n" @@ -3249,8 +3245,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM…\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Идентификация.. " +msgid "Identifying... " +msgstr "Идентификация... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3262,8 +3258,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Размонтирование CD-ROM…\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Поиск на диске индексных файлов..\n" +msgid "Scanning disc for index files...\n" +msgstr "Поиск на диске индексных файлов...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/sk.po b/po/sk.po index 3f3266fb2..b20c0ef48 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1147,7 +1147,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages." "debian.org" @@ -3180,10 +3180,6 @@ msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" msgid "Using CD-ROM mount point %s\n" msgstr "Použije sa prípojný bod CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM sa odpája\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" @@ -3193,8 +3189,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identifikuje sa.." +msgid "Identifying... " +msgstr "Identifikuje sa..." #: apt-pkg/cdrom.cc:643 #, c-format @@ -3206,8 +3202,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM sa odpája...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Na disku sa hľadajú indexové súbory..\n" +msgid "Scanning disc for index files...\n" +msgstr "Na disku sa hľadajú indexové súbory...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/sl.po b/po/sl.po index 0de57e349..00c581d77 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1143,9 +1143,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka, Urejanje se ni končalo" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Kako čudno .. Velikosti se ne ujemata, pošljite sporočilo na apt@packages." +"Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na apt@packages." "debian.org" #. TRANSLATOR: The required space between number and unit is already included @@ -3188,10 +3188,6 @@ msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa" msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljanje CD-ROM-ove priklopne točke %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Odklapljanje CD-ROM-a\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čakanje na disk ...\n" @@ -3201,7 +3197,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Priklapljanje CD-ROM-a ...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Identificiranje ... " #: apt-pkg/cdrom.cc:643 @@ -3214,8 +3210,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Odklapljanje CD-ROM-a ...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Preiskovanje diska za datoteke kazala ..\n" +msgid "Scanning disc for index files...\n" +msgstr "Preiskovanje diska za datoteke kazala ...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/sv.po b/po/sv.po index 2423b54a9..9a5addfcf 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1134,9 +1134,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Konstigt.. storlekarna stämde inte överens, skicka e-post till apt@packages." +"Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages." "debian.org" #. TRANSLATOR: The required space between number and unit is already included @@ -1536,7 +1536,7 @@ msgstr "Fel vid kompilering av reguljärt uttryck - %s" #: apt-private/private-cachefile.cc:87 msgid "Correcting dependencies..." -msgstr "Korrigerar beroenden...." +msgstr "Korrigerar beroenden..." #: apt-private/private-cachefile.cc:90 msgid " failed." @@ -3180,10 +3180,6 @@ msgstr "Leverantörsblocket %s saknar fingeravtryck" msgid "Using CD-ROM mount point %s\n" msgstr "Använder cd-rom-monteringspunkten %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Avmonterar cd-rom\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Väntar på skiva...\n" @@ -3193,8 +3189,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Identifierar.. " +msgid "Identifying... " +msgstr "Identifierar... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3203,10 +3199,10 @@ msgstr "Lagrad etikett: %s \n" #: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterar cd-rom...\n" +msgstr "Avmonterar CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Söker efter indexfiler på skivan...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/th.po b/po/th.po index a60dc7434..5c2c37fd8 100644 --- a/po/th.po +++ b/po/th.po @@ -1124,8 +1124,8 @@ msgid "Internal error, Ordering didn't finish" msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "แปลกประหลาด.. ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "แปลกประหลาด... ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3116,10 +3116,6 @@ msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ msgid "Using CD-ROM mount point %s\n" msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "กำลังเลิกเมานท์ซีดีรอม\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "กำลังรอแผ่น...\n" @@ -3129,8 +3125,8 @@ msgid "Mounting CD-ROM...\n" msgstr "กำลังเมานท์ซีดีรอม...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "กำลังตรวจสอบชื่อแผ่น.. " +msgid "Identifying... " +msgstr "กำลังตรวจสอบชื่อแผ่น... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3142,8 +3138,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี..\n" +msgid "Scanning disc for index files...\n" +msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/tl.po b/po/tl.po index fd43208ea..eedcc8ddd 100644 --- a/po/tl.po +++ b/po/tl.po @@ -1129,9 +1129,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." +"Nakapagtataka... Hindi magkatugma ang laki, mag-email sa apt@packages.debian." "org" #. TRANSLATOR: The required space between number and unit is already included @@ -3161,10 +3161,6 @@ msgstr "Block ng nagbebenta %s ay walang fingerprint" msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Ina-unmount ang CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" @@ -3174,7 +3170,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Kinikilala..." #: apt-pkg/cdrom.cc:643 @@ -3183,12 +3179,11 @@ msgid "Stored label: %s\n" msgstr "Naka-imbak na Label: %s \n" #: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy msgid "Unmounting CD-ROM...\n" -msgstr "Ina-unmount ang CD-ROM..." +msgstr "Ina-unmount ang CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/tr.po b/po/tr.po index 4027ecc85..ce3042910 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1149,9 +1149,9 @@ msgid "Internal error, Ordering didn't finish" msgstr "İç hata, Sıralama tamamlanamadı" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Ne kadar ilginç.. Boyutlar eşleşmedi, apt@packages.debian.org adresine " +"Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine " "eposta atın." #. TRANSLATOR: The required space between number and unit is already included @@ -3206,10 +3206,6 @@ msgstr "Sağlayıcı bloğu %s parmak izi içermiyor" msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM bağlama noktası %s kullanılıyor\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM ayrılıyor\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Disk bekleniliyor...\n" @@ -3219,7 +3215,7 @@ msgid "Mounting CD-ROM...\n" msgstr "CD-ROM bağlanıyor...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Tanımlanıyor... " #: apt-pkg/cdrom.cc:643 @@ -3232,8 +3228,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM ayrılıyor...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Disk, indeks dosyaları için taranıyor..\n" +msgid "Scanning disc for index files...\n" +msgstr "Disk, indeks dosyaları için taranıyor...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/uk.po b/po/uk.po index 707124c13..770f83d3b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1167,8 +1167,8 @@ msgid "Internal error, Ordering didn't finish" msgstr "Внутрішня помилка, Ordering не завершилася" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "Дивно... Розбіжність розмірів, напишіть на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -3231,10 +3231,6 @@ msgstr "Блок постачальника %s не містить відбит msgid "Using CD-ROM mount point %s\n" msgstr "Використовується точка монтування CD-ROM: %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Демонтується CD-ROM\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Чекаю на диск...\n" @@ -3244,8 +3240,8 @@ msgid "Mounting CD-ROM...\n" msgstr "Монтується CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "Ідентифікація.. " +msgid "Identifying... " +msgstr "Ідентифікація... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3257,8 +3253,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "Демонтується CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "Сканується диск на вміст індексних файлів..\n" +msgid "Scanning disc for index files...\n" +msgstr "Сканується диск на вміст індексних файлів...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/vi.po b/po/vi.po index 61f5ef3fe..d4d94e994 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1204,7 +1204,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: Tiến trình Sắp xếp chưa xong" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho <apt@packages.debian.org>" @@ -3259,10 +3259,6 @@ msgstr "Khối nhà bán %s không chứa vân tay" msgid "Using CD-ROM mount point %s\n" msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "Đang bỏ gắn CD-ROM...\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Đang đợi đĩa...\n" @@ -3272,7 +3268,7 @@ msgid "Mounting CD-ROM...\n" msgstr "Đang gắn đĩa CD-ROM...\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " +msgid "Identifying... " msgstr "Đang nhận diện... " #: apt-pkg/cdrom.cc:643 @@ -3285,7 +3281,7 @@ msgid "Unmounting CD-ROM...\n" msgstr "Đang bỏ gắn CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" +msgid "Scanning disc for index files...\n" msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" #: apt-pkg/cdrom.cc:717 diff --git a/po/zh_CN.po b/po/zh_CN.po index 31ae60ab0..970e35138 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1112,7 +1112,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" #. TRANSLATOR: The required space between number and unit is already included @@ -3103,10 +3103,6 @@ msgstr "软件提供者数据块内 %s 没有包含指纹信息" msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "正在卸载 CD-ROM 文件系统\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" @@ -3116,8 +3112,8 @@ msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "正在鉴别.. " +msgid "Identifying... " +msgstr "正在鉴别... " #: apt-pkg/cdrom.cc:643 #, c-format @@ -3129,8 +3125,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "正在卸载 CD-ROM...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "正在盘片中查找索引文件..\n" +msgid "Scanning disc for index files...\n" +msgstr "正在盘片中查找索引文件...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/po/zh_TW.po b/po/zh_TW.po index cdb02aa55..bbe96b72d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1105,7 +1105,7 @@ msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，排序未能完成" #: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included @@ -3097,10 +3097,6 @@ msgstr "提供者區塊 %s 沒有包含指紋碼" msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" -#: apt-pkg/cdrom.cc:583 -msgid "Unmounting CD-ROM\n" -msgstr "正在卸載光碟機\n" - #: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "正在等待碟片...\n" @@ -3110,8 +3106,8 @@ msgid "Mounting CD-ROM...\n" msgstr "正在掛載光碟機... \n" #: apt-pkg/cdrom.cc:605 -msgid "Identifying.. " -msgstr "正在識別.." +msgid "Identifying... " +msgstr "正在識別..." #: apt-pkg/cdrom.cc:643 #, c-format @@ -3123,8 +3119,8 @@ msgid "Unmounting CD-ROM...\n" msgstr "正在卸載光碟機...\n" #: apt-pkg/cdrom.cc:667 -msgid "Scanning disc for index files..\n" -msgstr "正在掃描碟片中的索引檔..\n" +msgid "Scanning disc for index files...\n" +msgstr "正在掃描碟片中的索引檔...\n" #: apt-pkg/cdrom.cc:717 #, c-format diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index fddd26bd9..8d8fdf167 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -35,11 +35,11 @@ aptcdromlog() { } CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/ -Unmounting CD-ROM +Unmounting CD-ROM... Waiting for disc... Please insert a Disc in the drive and press enter Mounting CD-ROM... -Scanning disc for index files.." +Scanning disc for index files..." CDROM_POST="This disc is called: 'Debian APT Testdisk 0.8.15' Writing new source list -- cgit v1.2.3 From 0d58c26ad7b2308f08f4e6002cbf218605c1c7cf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 14:15:45 +0100 Subject: improve debug output in case downloadfile fails Git-Dch: Ignore --- cmdline/apt-helper.cc | 15 +++--- test/integration/framework | 83 ++++++++++++++++++----------- test/integration/test-apt-https-no-redirect | 20 ++++--- test/integration/test-partial-file-support | 43 +++++---------- 4 files changed, 86 insertions(+), 75 deletions(-) diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index d66b3ffae..37279ec28 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -19,6 +19,7 @@ #include <apt-private/acqprogress.h> #include <apt-private/private-output.h> +#include <apt-private/private-download.h> #include <apt-private/private-cmndline.h> #include <iostream> @@ -27,7 +28,6 @@ #include <apti18n.h> /*}}}*/ -using namespace std; static bool DoDownloadFile(CommandLine &CmdL) { @@ -43,23 +43,22 @@ static bool DoDownloadFile(CommandLine &CmdL) new pkgAcqFile(&Fetcher, download_uri, "", 0, "desc", "short-desc", "dest-dir-ignored", targetfile); Fetcher.Run(); - if (!FileExists(targetfile)) - { - _error->Error(_("Download Failed")); - return false; - } + bool Failed = false; + if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == false || + FileExists(targetfile) == false) + return _error->Error(_("Download Failed")); return true; } static bool ShowHelp(CommandLine &) { - ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, + ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; - cout << + std::cout << _("Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" "\n" diff --git a/test/integration/framework b/test/integration/framework index bf6fa0218..c623e6231 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -863,18 +863,16 @@ signreleasefiles() { webserverconfig() { msgtest "Set webserver config option '${1}' to" "$2" - downloadfile "http://localhost:8080/_config/set/${1}/${2}" '/dev/null' >/dev/null - local DOWNLOG='download-testfile.log' - rm -f "$DOWNLOG" - local STATUS="${TMPWORKINGDIRECTORY}/rootdir/tmp/webserverconfig.status" - downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" - if [ "$(cat "$STATUS")" = '200' ]; then + local DOWNLOG='rootdir/tmp/download-testfile.log' + local STATUS='rootdir/tmp/webserverconfig.status' + rm -f "$STATUS" "$DOWNLOG" + if downloadfile "http://localhost:8080/_config/set/${1}/${2}" "$STATUS" > "$DOWNLOG"; then msgpass else - cat >&2 "$DOWNLOG" - msgfail "Statuscode was $(cat "$STATUS")" + cat "$DOWNLOG" "$STATUS" + msgfail fi - rm "$STATUS" + testwebserverlaststatuscode '200' } rewritesourceslist() { @@ -952,10 +950,10 @@ acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom } downloadfile() { - PROTO="$(echo "$1" | cut -d':' -f 1)" - apthelper -o Acquire::https::CaInfo=${TESTDIR}/apt.pem \ - -o Debug::Acquire::${PROTO}=1 \ - download-file "$1" "$2" 2>&1 + local PROTO="$(echo "$1" | cut -d':' -f 1 )" + apthelper -o Acquire::https::CaInfo=${TESTDIR}/apt.pem \ + -o Debug::Acquire::${PROTO}=1 \ + download-file "$1" "$2" 2>&1 || true # only if the file exists the download was successful if [ -e "$2" ]; then return 0 @@ -967,8 +965,8 @@ downloadfile() { checkdiff() { local DIFFTEXT="$(command diff -u "$@" | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')" if [ -n "$DIFFTEXT" ]; then - echo - echo "$DIFFTEXT" + echo >&2 + echo >&2 "$DIFFTEXT" return 1 else return 0 @@ -1017,7 +1015,9 @@ testequalor2() { shift 2 msgtest "Test for equality OR of" "$*" $* >$COMPAREAGAINST 2>&1 || true - if checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null || checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null; then + if checkdiff $COMPAREFILE1 $COMPAREAGAINST >/dev/null 2>&1 || \ + checkdiff $COMPAREFILE2 $COMPAREAGAINST >/dev/null 2>&1 + then msgpass else echo -n "\n${CINFO}Diff against OR 1${CNORMAL}" @@ -1051,24 +1051,24 @@ testnopackage() { msgtest "Test for non-existent packages" "apt-cache show $*" local SHOWPKG="$(aptcache show "$@" 2>&1 | grep '^Package: ')" if [ -n "$SHOWPKG" ]; then - echo - echo "$SHOWPKG" + echo >&2 + echo >&2 "$SHOWPKG" msgfail - return 1 + else + msgpass fi - msgpass } testdpkginstalled() { msgtest "Test for correctly installed package(s) with" "dpkg -l $*" local PKGS="$(dpkg -l "$@" 2>/dev/null | grep '^i' | wc -l)" if [ "$PKGS" != $# ]; then - echo $PKGS - dpkg -l "$@" | grep '^[a-z]' + echo >&2 $PKGS + dpkg -l "$@" | grep '^[a-z]' >&2 msgfail - return 1 + else + msgpass fi - msgpass } testdpkgnotinstalled() { @@ -1076,11 +1076,11 @@ testdpkgnotinstalled() { local PKGS="$(dpkg -l "$@" 2> /dev/null | grep '^i' | wc -l)" if [ "$PKGS" != 0 ]; then echo - dpkg -l "$@" | grep '^[a-z]' + dpkg -l "$@" | grep '^[a-z]' >&2 msgfail - return 1 + else + msgpass fi - msgpass } testmarkedauto() { @@ -1105,8 +1105,8 @@ testsuccess() { if $@ >${OUTPUT} 2>&1; then msgpass else - echo - cat $OUTPUT + echo >&2 + cat >&2 $OUTPUT msgfail fi } @@ -1119,14 +1119,35 @@ testfailure() { fi local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" if $@ >${OUTPUT} 2>&1; then - echo - cat $OUTPUT + echo >&2 + cat >&2 $OUTPUT msgfail else msgpass fi } +testwebserverlaststatuscode() { + local DOWNLOG='rootdir/tmp/webserverstatus-testfile.log' + local STATUS='rootdir/tmp/webserverstatus-statusfile.log' + rm -f "$DOWNLOG" "$STATUS" + msgtest 'Test last status code from the webserver was' "$1" + downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" + if [ "$(cat "$STATUS")" = "$1" ]; then + msgpass + else + echo >&2 + if [ -n "$2" ]; then + shift + echo >&2 '#### Additionally provided output files contain:' + cat >&2 "$@" + fi + echo >&2 '#### Download log of the status code:' + cat >&2 "$DOWNLOG" + msgfail "Status was $(cat "$STATUS")" + fi +} + pause() { echo "STOPPED execution. Press enter to continue" local IGNORE diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect index 0408c6832..73352a28c 100755 --- a/test/integration/test-apt-https-no-redirect +++ b/test/integration/test-apt-https-no-redirect @@ -7,18 +7,24 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture "i386" -buildsimplenativepackage 'apt' 'all' '1.0' 'stable' +insertpackage 'stable' 'apt' 'all' '1' setupaptarchive --no-update +echo 'alright' > aptarchive/working 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 'download of a file works via' 'http' +downloadfile 'http://localhost:8080/working' httpfile >/dev/null 2>&1 && msgpass || msgfail +testfileequal httpfile 'alright' -msgtest 'normal https download works' -downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog >/dev/null 2>/dev/null && msgpass || msgfail +msgtest 'download of a file works via' 'https' +downloadfile 'https://localhost:4433/working' httpsfile >/dev/null 2>&1 && msgpass || msgfail +testfileequal httpsfile 'alright' -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 || msgfail +msgtest 'download of a file does not work if' 'https redirected to http' +downloadfile 'https://localhost:4433/redirectme/working' redirectfile >curloutput 2>&1 && msgfail || msgpass + +msgtest 'libcurl has forbidden access in last request to' 'http resource' +grep -q -- 'Protocol http not supported or disabled in libcurl' curloutput && msgpass || msgfail diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support index 382789e68..5ab326def 100755 --- a/test/integration/test-partial-file-support +++ b/test/integration/test-partial-file-support @@ -13,17 +13,18 @@ copysource() { touch -d "$(stat --format '%y' "${TESTFILE}")" "$3" } +DOWNLOADLOG='rootdir/tmp/testdownloadfile.log' + testdownloadfile() { - local DOWNLOG='download-testfile.log' - rm -f "$DOWNLOG" + rm -f "$DOWNLOADLOG" msgtest "Testing download of file $2 with" "$1" - if ! downloadfile "$2" "$3" > "$DOWNLOG"; then - cat >&2 "$DOWNLOG" + if ! downloadfile "$2" "$3" > "$DOWNLOADLOG"; then + cat >&2 "$DOWNLOADLOG" msgfail else msgpass fi - cat "$DOWNLOG" | while read field hash; do + cat "$DOWNLOADLOG" | while read field hash; do local EXPECTED case "$field" in 'MD5Sum-Hash:') EXPECTED="$(md5sum "$TESTFILE" | cut -d' ' -f 1)";; @@ -40,28 +41,12 @@ testdownloadfile() { if [ "$EXPECTED" "$4" "$hash" ]; then msgpass else - cat >&2 "$DOWNLOG" + cat >&2 "$DOWNLOADLOG" msgfail "expected: $EXPECTED ; got: $hash" fi done } -testwebserverlaststatuscode() { - local DOWNLOG='download-testfile.log' - rm -f "$DOWNLOG" - local STATUS="$(mktemp)" - addtrap "rm $STATUS;" - msgtest 'Test last status code from the webserver was' "$1" - downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" - if [ "$(cat "$STATUS")" = "$1" ]; then - msgpass - else - cat >&2 "$DOWNLOG" - msgfail "Status was $(cat "$STATUS")" - fi -} - - TESTFILE='aptarchive/testfile' cp -a ${TESTDIR}/framework $TESTFILE @@ -70,34 +55,34 @@ testrun() { copysource $TESTFILE 0 ./testfile testdownloadfile 'no data' "${1}/testfile" './testfile' '=' - testwebserverlaststatuscode '200' + testwebserverlaststatuscode '200' "$DOWNLOADLOG" copysource $TESTFILE 20 ./testfile testdownloadfile 'valid partial data' "${1}/testfile" './testfile' '=' - testwebserverlaststatuscode '206' + testwebserverlaststatuscode '206' "$DOWNLOADLOG" copysource /dev/zero 20 ./testfile testdownloadfile 'invalid partial data' "${1}/testfile" './testfile' '!=' - testwebserverlaststatuscode '206' + testwebserverlaststatuscode '206' "$DOWNLOADLOG" copysource $TESTFILE 1M ./testfile testdownloadfile 'completely downloaded file' "${1}/testfile" './testfile' '=' - testwebserverlaststatuscode '416' + testwebserverlaststatuscode '416' "$DOWNLOADLOG" copysource /dev/zero 1M ./testfile testdownloadfile 'too-big partial file' "${1}/testfile" './testfile' '=' - testwebserverlaststatuscode '200' + testwebserverlaststatuscode '200' "$DOWNLOADLOG" copysource /dev/zero 20 ./testfile touch ./testfile testdownloadfile 'old data' "${1}/testfile" './testfile' '=' - testwebserverlaststatuscode '200' + testwebserverlaststatuscode '200' "$DOWNLOADLOG" webserverconfig 'aptwebserver::support::range' 'false' copysource $TESTFILE 20 ./testfile testdownloadfile 'no server support' "${1}/testfile" './testfile' '=' - testwebserverlaststatuscode '200' + testwebserverlaststatuscode '200' "$DOWNLOADLOG" } testrun 'http://localhost:8080' -- cgit v1.2.3 From 52922e2a6795aadcbb8dd11bba14db0f05da34c6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 15:12:11 +0100 Subject: cmdline parsing: apt-config is not apt-cdrom --- cmdline/apt-config.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index d95780c73..40ba468eb 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -108,7 +108,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {"help",&ShowHelp}, {0,0}}; - std::vector<CommandLine::Args> Args = getCommandArgs("apt-cdrom", CommandLine::GetCommand(Cmds, argc, argv)); + std::vector<CommandLine::Args> Args = getCommandArgs("apt-config", CommandLine::GetCommand(Cmds, argc, argv)); // Set up gettext support setlocale(LC_ALL,""); -- cgit v1.2.3 From b9b0f6222c489db78331cc8be3c093538d22c70b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 17:53:22 +0100 Subject: use a configurable list of versioned kernel packages With APT::VersionedKernelPackages users have the option of adding packages like pre-build out-of-tree modules to the list of automatically protected from being autoremoved. --- debian/apt.auto-removal.sh | 21 ++--- debian/apt.conf.autoremove | 9 +++ test/integration/framework | 10 ++- .../test-bug-1078697-missing-source-hashes | 35 --------- test/integration/test-kernel-helper-autoremove | 91 ++++++++++++---------- .../test-kernel-helper-autoremove.fake-dpkg | 13 ---- .../test-ubuntu-bug-1078697-missing-source-hashes | 35 +++++++++ 7 files changed, 113 insertions(+), 101 deletions(-) delete mode 100755 test/integration/test-bug-1078697-missing-source-hashes delete mode 100644 test/integration/test-kernel-helper-autoremove.fake-dpkg create mode 100755 test/integration/test-ubuntu-bug-1078697-missing-source-hashes diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index d105f440a..9c4a4157d 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -72,22 +72,23 @@ $previous_version EOF ) -cat > "$config_file".dpkg-new <<EOF +generateconfig() { + cat <<EOF // File autogenerated by $0, do not edit APT { NeverAutoRemove { EOF -for kernel in $kernels; do - echo " \"^linux-image-${kernel}$\";" >> "$config_file".dpkg-new - echo " \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new - echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new - echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new - echo " \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new -done -cat >> "$config_file".dpkg-new <<EOF + apt-config dump --no-empty --format '%v%n' 'APT::VersionedKernelPackages' | while read package; do + for kernel in $kernels; do + echo " \"^${package}-${kernel}$\";" + done + done + cat <<EOF }; }; EOF -mv "$config_file".dpkg-new "$config_file" +} +generateconfig > "${config_file}.dpkg-new" +mv "${config_file}.dpkg-new" "$config_file" diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 9684c9c7d..ea68f88fc 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -9,6 +9,15 @@ APT "^gnumach-image.*"; }; + VersionedKernelPackages + { + "linux-image"; + "linux-image-extra"; + "linux-signed-image"; + "linux-backports-modules-.*"; + "linux-headers"; + }; + Never-MarkAuto-Sections { "metapackages"; diff --git a/test/integration/framework b/test/integration/framework index c623e6231..dad8c99f0 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -93,14 +93,15 @@ msgdone() { runapt() { msgdebug "Executing: ${CCMD}$*${CDEBUG} " - local CMD="$1" + local CMD="${BUILDDIRECTORY}/$1" + if [ "$1" = 'sh' ]; then CMD='sh'; fi shift if [ -f ./aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@" elif [ -f ../aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@" else - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@" + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@" fi } aptconfig() { runapt apt-config "$@"; } @@ -198,6 +199,7 @@ setupenvironment() { touch var/lib/dpkg/available mkdir -p usr/lib/apt ln -s ${METHODSDIR} usr/lib/apt/methods + ln -s ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove etc/apt/apt.conf.d/01autoremove 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-1078697-missing-source-hashes b/test/integration/test-bug-1078697-missing-source-hashes deleted file mode 100755 index 6fcb856b5..000000000 --- a/test/integration/test-bug-1078697-missing-source-hashes +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -set -e - -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework -setupenvironment -configarchitecture "i386" - -msgtest 'Test apt-ftparchive source with missing hashes in .dsc' - -touch aptarchive/foo_1.0.tar.gz -cat > aptarchive/foo_1.0.dsc << EOF -Format: 3.0 (native) -Source: foo -Binary: foo -Architecture: all -Version: 1.0 -Package-List: - foo deb admin extra -Files: - d41d8cd98f00b204e9800998ecf8427e 0 foo_1.0.tar.gz -EOF - -# check for the SHA hashes -aptftparchive sources aptarchive/ > aptarchive/Sources 2>/dev/null || msgfail -test -n "$(grep Checksums-Sha512 aptarchive/Sources)" && msgpass || msgfail - -for hash in sha512sum sha256sum sha1sum; do - for f in foo_1.0.tar.gz foo_1.0.dsc; do - SUM=$($hash aptarchive/$f | cut -d' ' -f1) - msgtest "Test $hash hash matches for $f" - NEEDLE="$SUM $(stat -c%s aptarchive/$f) $f" - test -n "$SUM" && test -n "$(grep "$NEEDLE" aptarchive/Sources)" && msgpass || msgfail - done -done diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index 2b165d100..be30c6f6e 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -1,55 +1,68 @@ #!/bin/sh - set -e -# setup testdir TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework +setupenvironment +configarchitecture 'native' -TMPDIR=$(mktemp -d) -cd $TMPDIR -addtrap "cd /; rm -rf $TMPDIR" +# the executed script would use the installed apt-config, +# which is outside of our control +msgtest 'Check that the installed apt-config supports' '--no-empty' +if apt-config dump --no-empty >/dev/null 2>&1; then + msgpass +else + msgskip + exit 0 +fi -# create mock environment -mkdir apt.conf.d -cat > aptconfig.conf <<EOF -Dir::Etc::parts "$TMPDIR/apt.conf.d"; -Dir::bin::dpkg "$TMPDIR/fake-dpkg"; +# install fake-dpkg into it +cat > ./fake-dpkg <<EOF +#!/bin/sh +set -e +if [ "\$1" = "-l" ]; then + echo "ii linux-image-1.0.0-2-generic 1.0.0-2 amd64" + echo "ii linux-image-\$(uname -r) not-used amd64" + echo "ii linux-image-100.0.0-1-generic 100.0.0.1-1 amd64" +else + dpkg "\$@" +fi EOF -APT_CONFIG=aptconfig.conf -export APT_CONFIG +chmod +x ./fake-dpkg +echo 'Dir::Bin::dpkg "./fake-dpkg";' > rootdir/etc/apt/apt.conf.d/99fakedpkg -# install fake-dpkg into it -install -m755 $TESTDIR/test-kernel-helper-autoremove.fake-dpkg $TMPDIR/fake-dpkg +catfail() { + echo >&2 + echo >&2 '### List of protected kernels:' + cat >&2 protected.list + msgfail +} -# run the helper -sh ${TESTDIR}/../../debian/apt.auto-removal.sh +testprotected() { + rm -f rootdir/etc/apt/apt.conf.d/01autoremove-kernels protected.list -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 && msgpass || msgfail + testsuccess runapt sh ${TESTDIR}/../../debian/apt.auto-removal.sh "$@" -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 + msgtest 'Check kernel autoremoval protection list' 'is created' + test -e rootdir/etc/apt/apt.conf.d/01autoremove-kernels && 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 + msgtest 'Check kernel autoremoval protection list' 'can be dumped' + aptconfig dump --no-empty --format '%v%n' 'APT::NeverAutoRemove' >protected.list 2>&1 && msgpass || catfail -# 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 + msgtest 'Check kernel autoremoval protection list' 'can be parsed' + grep -q '^[A-Z]: ' protected.list && catfail || 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 + msgtest 'Check kernel autoremoval protection list includes' 'most recent kernel' + grep -q '^\^linux-image-100\.0\.0-1-generic\$$' protected.list && msgpass || catfail + + msgtest 'Check kernel autoremoval protection list includes' 'running kernel' + grep -q "^\\^linux-image-$(uname -r)\\\$\$" protected.list && msgpass || catfail +} + +testprotected +msgtest 'Check kernel autoremoval protection list does not include' 'old kernel' +grep -q '^\^linux-image-1\.0\.0-2-generic\$$' protected.list && catfail || msgpass -# done +testprotected 1.0.0-2-generic +msgtest 'Check kernel autoremoval protection list includes' 'installed kernel' +grep -q '^\^linux-image-1\.0\.0-2-generic\$$' protected.list && msgpass || catfail diff --git a/test/integration/test-kernel-helper-autoremove.fake-dpkg b/test/integration/test-kernel-helper-autoremove.fake-dpkg deleted file mode 100644 index a365c5370..000000000 --- a/test/integration/test-kernel-helper-autoremove.fake-dpkg +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -e - -if [ "$1" = "-l" ]; then - echo "ii linux-image-1.0.0-2-generic 1.0.01-2 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" -else - dpkg $@ -fi - diff --git a/test/integration/test-ubuntu-bug-1078697-missing-source-hashes b/test/integration/test-ubuntu-bug-1078697-missing-source-hashes new file mode 100755 index 000000000..6fcb856b5 --- /dev/null +++ b/test/integration/test-ubuntu-bug-1078697-missing-source-hashes @@ -0,0 +1,35 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture "i386" + +msgtest 'Test apt-ftparchive source with missing hashes in .dsc' + +touch aptarchive/foo_1.0.tar.gz +cat > aptarchive/foo_1.0.dsc << EOF +Format: 3.0 (native) +Source: foo +Binary: foo +Architecture: all +Version: 1.0 +Package-List: + foo deb admin extra +Files: + d41d8cd98f00b204e9800998ecf8427e 0 foo_1.0.tar.gz +EOF + +# check for the SHA hashes +aptftparchive sources aptarchive/ > aptarchive/Sources 2>/dev/null || msgfail +test -n "$(grep Checksums-Sha512 aptarchive/Sources)" && msgpass || msgfail + +for hash in sha512sum sha256sum sha1sum; do + for f in foo_1.0.tar.gz foo_1.0.dsc; do + SUM=$($hash aptarchive/$f | cut -d' ' -f1) + msgtest "Test $hash hash matches for $f" + NEEDLE="$SUM $(stat -c%s aptarchive/$f) $f" + test -n "$SUM" && test -n "$(grep "$NEEDLE" aptarchive/Sources)" && msgpass || msgfail + done +done -- cgit v1.2.3 From 33677a0cddd552f96963eac6dc74d8ffe9c1f2f6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 20:57:07 +0100 Subject: support kfreebsd and hurd in the kernel hook kfreebsd as well as hurd kernel packages call the postinst script as well so we just need to enable the correct parsing for installed packages and disable the "protect every version" hammer for them. --- debian/apt.auto-removal.sh | 16 +++------- debian/apt.conf.autoremove | 8 ++--- test/integration/framework | 2 +- test/integration/test-kernel-helper-autoremove | 44 ++++++++++++++++++++------ 4 files changed, 44 insertions(+), 26 deletions(-) diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 9c4a4157d..ab8201898 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -1,5 +1,4 @@ #!/bin/sh - set -e # Author: Steve Langasek <steve.langasek@canonical.com> @@ -42,7 +41,7 @@ version_test_gt () return "$?" } -list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ && $2 !~ /-dbg$/ { print $2 }' | sed -e's/linux-image-//') +list="$(${DPKG} -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]*/ && $2 !~ /-dbg$/ { print $2 }' | sed -e 's#\(linux\|kfreebsd\|gnumach\)-image-##')" latest_version="" previous_version="" @@ -74,21 +73,16 @@ EOF generateconfig() { cat <<EOF -// File autogenerated by $0, do not edit -APT +// DO NOT EDIT! File autogenerated by $0 +APT::NeverAutoRemove { - NeverAutoRemove - { EOF apt-config dump --no-empty --format '%v%n' 'APT::VersionedKernelPackages' | while read package; do for kernel in $kernels; do - echo " \"^${package}-${kernel}$\";" + echo " \"^${package}-${kernel}$\";" done done - cat <<EOF - }; -}; -EOF + echo '};' } generateconfig > "${config_file}.dpkg-new" mv "${config_file}.dpkg-new" "$config_file" diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index ea68f88fc..5b958c716 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -4,18 +4,18 @@ APT { "^firmware-linux.*"; "^linux-firmware$"; - "^kfreebsd-image.*"; - "^gnumach$"; - "^gnumach-image.*"; }; VersionedKernelPackages { "linux-image"; + "linux-headers"; "linux-image-extra"; "linux-signed-image"; "linux-backports-modules-.*"; - "linux-headers"; + "kfreebsd-image"; + "kfreebsd-headers"; + "gnumach-image"; }; Never-MarkAuto-Sections diff --git a/test/integration/framework b/test/integration/framework index dad8c99f0..6502dbad1 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -194,7 +194,7 @@ setupenvironment() { mkdir rootdir aptarchive keys cd rootdir mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d - mkdir -p var/cache var/lib var/log tmp + mkdir -p var/cache var/lib/apt var/log tmp mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers touch var/lib/dpkg/available mkdir -p usr/lib/apt diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index be30c6f6e..cb1c54e81 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -4,7 +4,7 @@ set -e TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture 'native' +configarchitecture 'amd64' # the executed script would use the installed apt-config, # which is outside of our control @@ -16,21 +16,21 @@ else exit 0 fi -# install fake-dpkg into it +CURRENTKERNEL="linux-image-$(uname -r)" +insertinstalledpackage "$CURRENTKERNEL" 'amd64' '1' +insertinstalledpackage 'linux-image-1.0.0-2-generic' 'amd64' '1.0.0-2' +insertinstalledpackage 'linux-image-100.0.0-1-generic' 'amd64' '100.0.0-1' + +testsuccess aptmark auto "$CURRENTKERNEL" 'linux-image-1.0.0-2-generic' 'linux-image-100.0.0-1-generic' + cat > ./fake-dpkg <<EOF #!/bin/sh -set -e -if [ "\$1" = "-l" ]; then - echo "ii linux-image-1.0.0-2-generic 1.0.0-2 amd64" - echo "ii linux-image-\$(uname -r) not-used amd64" - echo "ii linux-image-100.0.0-1-generic 100.0.0.1-1 amd64" -else - dpkg "\$@" -fi +exec $(aptconfig dump --no-empty --format='%v ' 'DPKG::options') "\$@" EOF chmod +x ./fake-dpkg echo 'Dir::Bin::dpkg "./fake-dpkg";' > rootdir/etc/apt/apt.conf.d/99fakedpkg +# install fake-dpkg into it catfail() { echo >&2 echo >&2 '### List of protected kernels:' @@ -59,10 +59,34 @@ testprotected() { grep -q "^\\^linux-image-$(uname -r)\\\$\$" protected.list && msgpass || catfail } +testequal "Reading package lists... +Building dependency tree... +Reading state information... +The following packages will be REMOVED: + linux-image-1.0.0-2-generic (1.0.0-2) + linux-image-100.0.0-1-generic (100.0.0-1) + $CURRENTKERNEL (1) +0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded. +Remv linux-image-1.0.0-2-generic [1.0.0-2] +Remv linux-image-100.0.0-1-generic [100.0.0-1] +Remv $CURRENTKERNEL [1]" aptget autoremove -sV + testprotected msgtest 'Check kernel autoremoval protection list does not include' 'old kernel' grep -q '^\^linux-image-1\.0\.0-2-generic\$$' protected.list && catfail || msgpass +testequal 'Reading package lists... +Building dependency tree... +Reading state information... +The following packages will be REMOVED: + linux-image-1.0.0-2-generic +0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv linux-image-1.0.0-2-generic [1.0.0-2]' aptget autoremove -s + testprotected 1.0.0-2-generic msgtest 'Check kernel autoremoval protection list includes' 'installed kernel' grep -q '^\^linux-image-1\.0\.0-2-generic\$$' protected.list && msgpass || catfail +testequal 'Reading package lists... +Building dependency tree... +Reading state information... +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget autoremove -s -- cgit v1.2.3 From dae27c67f2219d9387274660529113cdb81a15c3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 21:12:59 +0100 Subject: add ".*-{kernel,modules}-$KERVER" matcher for hook Pre-build kernel modules (like those build with module-assistent) are commonly named in this way and it should be ungeneric enough to be added by default for everyone. --- debian/apt.conf.autoremove | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 5b958c716..cf69d56c3 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -8,14 +8,20 @@ APT VersionedKernelPackages { + # linux kernels "linux-image"; "linux-headers"; "linux-image-extra"; "linux-signed-image"; - "linux-backports-modules-.*"; + # kfreebsd kernels "kfreebsd-image"; "kfreebsd-headers"; + # hurd kernels "gnumach-image"; + # (out-of-tree) modules + ".*-modules"; + ".*-kernel"; + "linux-backports-modules-.*"; }; Never-MarkAuto-Sections -- cgit v1.2.3 From 7ce1ac857d914f98069078b1ea70995e7b6cf764 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 21:31:35 +0100 Subject: ensure that a dot is a dot in the hook As we deal with regex matchers here the dots are treated as wildcards if we don't take care of escaping them. Not very likely that this could be a real-world problem, but just to be sure. --- debian/apt.auto-removal.sh | 7 ++----- test/integration/test-kernel-helper-autoremove | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index ab8201898..0c5158658 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -63,13 +63,10 @@ then previous_version= fi -kernels=$(sort -u <<EOF -$latest_version +kernels="$(echo "$latest_version $installed_version $running_version -$previous_version -EOF -) +$previous_version" | sort -u | sed -e 's#\.#\\.#g' )" generateconfig() { cat <<EOF diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index cb1c54e81..7713c0875 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -20,8 +20,10 @@ CURRENTKERNEL="linux-image-$(uname -r)" insertinstalledpackage "$CURRENTKERNEL" 'amd64' '1' insertinstalledpackage 'linux-image-1.0.0-2-generic' 'amd64' '1.0.0-2' insertinstalledpackage 'linux-image-100.0.0-1-generic' 'amd64' '100.0.0-1' +# ensure that the '.' is really a dot and not a wildcard +insertinstalledpackage 'linux-headers-1000000-1-generic' 'amd64' '100.0.0-1' -testsuccess aptmark auto "$CURRENTKERNEL" 'linux-image-1.0.0-2-generic' 'linux-image-100.0.0-1-generic' +testsuccess aptmark auto "$CURRENTKERNEL" 'linux-image-1.0.0-2-generic' 'linux-image-100.0.0-1-generic' 'linux-headers-1000000-1-generic' cat > ./fake-dpkg <<EOF #!/bin/sh @@ -53,40 +55,46 @@ testprotected() { grep -q '^[A-Z]: ' protected.list && catfail || msgpass msgtest 'Check kernel autoremoval protection list includes' 'most recent kernel' - grep -q '^\^linux-image-100\.0\.0-1-generic\$$' protected.list && msgpass || catfail + grep -q '^\^linux-image-100\\\.0\\\.0-1-generic\$$' protected.list && msgpass || catfail msgtest 'Check kernel autoremoval protection list includes' 'running kernel' - grep -q "^\\^linux-image-$(uname -r)\\\$\$" protected.list && msgpass || catfail + grep -q "^\\^linux-image-$(uname -r | sed -e 's#\.#\\\\.#g')\\\$\$" protected.list && msgpass || catfail } testequal "Reading package lists... Building dependency tree... Reading state information... The following packages will be REMOVED: + linux-headers-1000000-1-generic (100.0.0-1) linux-image-1.0.0-2-generic (1.0.0-2) linux-image-100.0.0-1-generic (100.0.0-1) $CURRENTKERNEL (1) -0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded. +0 upgraded, 0 newly installed, 4 to remove and 0 not upgraded. +Remv linux-headers-1000000-1-generic [100.0.0-1] Remv linux-image-1.0.0-2-generic [1.0.0-2] Remv linux-image-100.0.0-1-generic [100.0.0-1] Remv $CURRENTKERNEL [1]" aptget autoremove -sV testprotected msgtest 'Check kernel autoremoval protection list does not include' 'old kernel' -grep -q '^\^linux-image-1\.0\.0-2-generic\$$' protected.list && catfail || msgpass +grep -q '^\^linux-image-1\\\.0\\\.0-2-generic\$$' protected.list && catfail || msgpass testequal 'Reading package lists... Building dependency tree... Reading state information... The following packages will be REMOVED: - linux-image-1.0.0-2-generic -0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. + linux-headers-1000000-1-generic linux-image-1.0.0-2-generic +0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded. +Remv linux-headers-1000000-1-generic [100.0.0-1] Remv linux-image-1.0.0-2-generic [1.0.0-2]' aptget autoremove -s testprotected 1.0.0-2-generic msgtest 'Check kernel autoremoval protection list includes' 'installed kernel' -grep -q '^\^linux-image-1\.0\.0-2-generic\$$' protected.list && msgpass || catfail +grep -q '^\^linux-image-1\\\.0\\\.0-2-generic\$$' protected.list && msgpass || catfail testequal 'Reading package lists... Building dependency tree... Reading state information... -0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget autoremove -s +The following packages will be REMOVED: + linux-headers-1000000-1-generic +0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv linux-headers-1000000-1-generic [100.0.0-1]' aptget autoremove -s -- cgit v1.2.3 From 3b8eb3bc1afb1fc84c6909cf2ee4907b82447409 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Mon, 10 Mar 2014 22:31:00 +0100 Subject: correct LD_LIBRARY_PATH and config loading for apt-helper Mostly ensures that we use the build methods and not the system provided methods in the tests (if we don't want it that way). Git-Dch: Ignore --- debian/tests/run-tests | 1 + test/integration/framework | 40 +++++++++++++++------------------------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 41bafda99..e6bc5e0d1 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -13,4 +13,5 @@ APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \ APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \ APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ +APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests diff --git a/test/integration/framework b/test/integration/framework index 6502dbad1..1ab421c4c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -93,15 +93,18 @@ msgdone() { runapt() { msgdebug "Executing: ${CCMD}$*${CDEBUG} " - local CMD="${BUILDDIRECTORY}/$1" - if [ "$1" = 'sh' ]; then CMD='sh'; fi + local CMD="$1" shift + case $CMD in + sh|aptitude|*/*) ;; + *) CMD="${BUILDDIRECTORY}/$CMD";; + esac if [ -f ./aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@" + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${LIBRARYPATH} $CMD "$@" elif [ -f ../aptconfig.conf ]; then - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@" + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${LIBRARYPATH} $CMD "$@" else - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@" + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${LIBRARYPATH} $CMD "$@" fi } aptconfig() { runapt apt-config "$@"; } @@ -112,33 +115,19 @@ aptftparchive() { runapt apt-ftparchive "$@"; } aptkey() { runapt apt-key "$@"; } aptmark() { runapt apt-mark "$@"; } apt() { runapt apt "$@"; } -apthelper() { - LD_LIBRARY_PATH=${APTHELPERBINDIR} ${APTHELPERBINDIR}/apt-helper "$@"; -} -aptwebserver() { - LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver "$@"; -} +apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; } +aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; } +aptitude() { runapt aptitude "$@"; } + dpkg() { command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" } dpkgcheckbuilddeps() { command dpkg-checkbuilddeps --admindir=${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg "$@" } -aptitude() { - if [ -f ./aptconfig.conf ]; then - APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" - elif [ -f ../aptconfig.conf ]; then - APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" - else - LD_LIBRARY_PATH=${BUILDDIRECTORY} command aptitude "$@" - fi -} gdb() { echo "gdb: run »$*«" - APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} command gdb ${BUILDDIRECTORY}/$1 --args "$@" -} -http() { - LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/http + APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${LIBRARYPATH} command gdb ${BUILDDIRECTORY}/$1 --args "$@" } gpg() { # see apt-key for the whole trickery. Setup is done in setupenvironment @@ -183,6 +172,7 @@ setupenvironment() { # allow overriding the default BUILDDIR location BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"} + LIBRARYPATH=${APT_INTEGRATION_TESTS_LIBRARY_PATH:-"${BUILDDIRECTORY}"} METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"} APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} @@ -246,7 +236,7 @@ setupenvironment() { # cleanup the environment a bit export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" export LC_ALL=C.UTF-8 - unset LANGUAGE + unset LANGUAGE APT_CONFIG unset GREP_OPTIONS DEB_BUILD_PROFILES msgdone "info" -- cgit v1.2.3 From e33dbfe5cea09b2124be8db5a6ae0eb82ad7e9c5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Mar 2014 16:53:44 +0100 Subject: factor out parsing of MultiArch flag Git-Dch: Ignore --- apt-pkg/deb/deblistparser.cc | 47 ++++++++++++++++++++++++-------------------- apt-pkg/deb/deblistparser.h | 3 +++ 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 7777d654e..18b8b931d 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -104,44 +104,49 @@ string debListParser::Version() return Section.FindS("Version"); } /*}}}*/ -// ListParser::NewVersion - Fill in the version structure /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool debListParser::NewVersion(pkgCache::VerIterator &Ver) +unsigned char debListParser::ParseMultiArch(bool const showErrors) /*{{{*/ { - // Parse the section - Ver->Section = UniqFindTagWrite("Section"); - - // Parse multi-arch + unsigned char MA; string const MultiArch = Section.FindS("Multi-Arch"); if (MultiArch.empty() == true) - Ver->MultiArch = pkgCache::Version::None; + MA = pkgCache::Version::None; else if (MultiArch == "same") { - // Parse multi-arch if (ArchitectureAll() == true) { - /* Arch all packages can't be Multi-Arch: same */ - _error->Warning("Architecture: all package '%s' can't be Multi-Arch: same", - Section.FindS("Package").c_str()); - Ver->MultiArch = pkgCache::Version::None; + if (showErrors == true) + _error->Warning("Architecture: all package '%s' can't be Multi-Arch: same", + Section.FindS("Package").c_str()); + MA = pkgCache::Version::None; } else - Ver->MultiArch = pkgCache::Version::Same; + MA = pkgCache::Version::Same; } else if (MultiArch == "foreign") - Ver->MultiArch = pkgCache::Version::Foreign; + MA = pkgCache::Version::Foreign; else if (MultiArch == "allowed") - Ver->MultiArch = pkgCache::Version::Allowed; + MA = pkgCache::Version::Allowed; else { - _error->Warning("Unknown Multi-Arch type '%s' for package '%s'", - MultiArch.c_str(), Section.FindS("Package").c_str()); - Ver->MultiArch = pkgCache::Version::None; + if (showErrors == true) + _error->Warning("Unknown Multi-Arch type '%s' for package '%s'", + MultiArch.c_str(), Section.FindS("Package").c_str()); + MA = pkgCache::Version::None; } if (ArchitectureAll() == true) - Ver->MultiArch |= pkgCache::Version::All; + MA |= pkgCache::Version::All; + return MA; +} + /*}}}*/ +// ListParser::NewVersion - Fill in the version structure /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debListParser::NewVersion(pkgCache::VerIterator &Ver) +{ + // Parse the section + Ver->Section = UniqFindTagWrite("Section"); + Ver->MultiArch = ParseMultiArch(true); // Archive Size Ver->Size = Section.FindULL("Size"); // Unpacked Size (in K) diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index c0973260f..03733ae8c 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -97,6 +97,9 @@ class debListParser : public pkgCacheGenerator::ListParser debListParser(FileFd *File, std::string const &Arch = ""); virtual ~debListParser() {}; + + private: + unsigned char ParseMultiArch(bool const showErrors); }; #endif -- cgit v1.2.3 From 68134bda8868a8614edf137aad7e9be61cd2a6ee Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Mar 2014 17:55:08 +0100 Subject: abstract version hash comparison a bit In #737085 we see that apt can be confused if informations about versions only differ slightly. This commit adds a way of at least adding a few more data points with the next abi break to help a bit with it. Git-Dch: Ignore --- apt-pkg/deb/deblistparser.cc | 21 +++++++++++++++++++++ apt-pkg/deb/deblistparser.h | 3 +++ apt-pkg/pkgcache.cc | 4 ++++ apt-pkg/pkgcachegen.cc | 14 ++++++++++---- apt-pkg/pkgcachegen.h | 9 +++++++++ 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 18b8b931d..a1bcfb710 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -938,3 +938,24 @@ unsigned char debListParser::GetPrio(string Str) return Out; } /*}}}*/ +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +bool debListParser::SameVersion(unsigned short const Hash, /*{{{*/ + pkgCache::VerIterator const &Ver) +{ + if (pkgCacheGenerator::ListParser::SameVersion(Hash, Ver) == false) + return false; + // status file has no (Download)Size, but all others are fair game + // status file is parsed last, so the first version we encounter is + // probably also the version we have downloaded + unsigned long long const Size = Section.FindULL("Size"); + if (Size != 0 && Size != Ver->Size) + return false; + // available everywhere, but easier to check here than to include in VersionHash + unsigned char MultiArch = ParseMultiArch(false); + if (MultiArch != Ver->MultiArch) + return false; + // for all practical proposes (we can check): same version + return true; +} + /*}}}*/ +#endif diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 03733ae8c..286244cc9 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -70,6 +70,9 @@ class debListParser : public pkgCacheGenerator::ListParser virtual std::string DescriptionLanguage(); virtual MD5SumValue Description_md5(); virtual unsigned short VersionHash(); +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver); +#endif virtual bool UsePackage(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver); virtual unsigned long Offset() {return iOffset;}; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index a19b9571c..91b75f52e 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -55,7 +55,11 @@ pkgCache::Header::Header() /* Whenever the structures change the major version should be bumped, whenever the generator changes the minor version should be bumped. */ MajorVersion = 8; +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + MinorVersion = 2; +#else MinorVersion = 1; +#endif Dirty = false; HeaderSz = sizeof(pkgCache::Header); diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 525f1dfb4..810f0b022 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -356,7 +356,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator map_ptrloc *LastVer = &Pkg->VersionList; void const * oldMap = Map.Data(); - unsigned long const Hash = List.VersionHash(); + unsigned short const Hash = List.VersionHash(); if (Ver.end() == false) { /* We know the list is sorted so we use that fact in the search. @@ -369,7 +369,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator if (Res > 0) break; // Versionstrings are equal - is hash also equal? - if (Res == 0 && Ver->Hash == Hash) + if (Res == 0 && List.SameVersion(Hash, Ver) == true) break; // proceed with the next till we have either the right // or we found another version (which will be lower) @@ -558,12 +558,12 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) if (Counter % 100 == 0 && Progress != 0) Progress->Progress(List.Offset()); - unsigned long Hash = List.VersionHash(); + unsigned short Hash = List.VersionHash(); pkgCache::VerIterator Ver = Pkg.VersionList(); Dynamic<pkgCache::VerIterator> DynVer(Ver); for (; Ver.end() == false; ++Ver) { - if (Ver->Hash == Hash && Version == Ver.VerStr()) + if (List.SameVersion(Hash, Ver) == true && Version == Ver.VerStr()) { if (List.CollectFileProvides(Cache,Ver) == false) return _error->Error(_("Error occurred while processing %s (%s%d)"), @@ -1051,6 +1051,12 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver, return true; } /*}}}*/ +bool pkgCacheGenerator::ListParser::SameVersion(unsigned short const Hash,/*{{{*/ + pkgCache::VerIterator const &Ver) +{ + return Hash == Ver->Hash; +} + /*}}}*/ // CacheGenerator::SelectFile - Select the current file being parsed /*{{{*/ // --------------------------------------------------------------------- /* This is used to select which file is to be associated with all newly diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 898b34358..5994dab9f 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -164,6 +164,15 @@ class pkgCacheGenerator::ListParser virtual std::string DescriptionLanguage() = 0; virtual MD5SumValue Description_md5() = 0; virtual unsigned short VersionHash() = 0; + /** compare currently parsed version with given version + * + * \param Hash of the currently parsed version + * \param Ver to compare with + */ +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + virtual +#endif + APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver); virtual bool UsePackage(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver) = 0; virtual unsigned long Offset() = 0; -- cgit v1.2.3 From 84baaae93badc2da7c1f4f356456762895cef278 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 31 May 2013 19:27:57 +0200 Subject: move fd duplication closer to the gz/bz2 open calls Git-Dch: Ignore --- apt-pkg/contrib/fileutl.cc | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 55ba41128..2188f616a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1067,30 +1067,12 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration: { Close(); Flags = (AutoClose) ? FileFd::AutoClose : 0; - if (AutoClose == false && ( -#ifdef HAVE_ZLIB - compressor.Name == "gzip" || -#endif -#ifdef HAVE_BZ2 - compressor.Name == "bzip2" || -#endif - false)) - { - // Need to duplicate fd here or gzclose for cleanup will close the fd as well - iFd = dup(Fd); - } - else - iFd = Fd; + iFd = Fd; this->FileName = ""; - if (Fd == -1 || OpenInternDescriptor(Mode, compressor) == false) + if (OpenInternDescriptor(Mode, compressor) == false) { if (iFd != -1 && ( -#ifdef HAVE_ZLIB - compressor.Name == "gzip" || -#endif -#ifdef HAVE_BZ2 - compressor.Name == "bzip2" || -#endif + (Flags & Compressed) == Compressed || AutoClose == true)) { close (iFd); @@ -1102,6 +1084,8 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration: } bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor) { + if (iFd == -1) + return false; if (compressor.Name == "." || compressor.Binary.empty() == true) return true; @@ -1110,6 +1094,21 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C d = new FileFdPrivate(); d->openmode = Mode; d->compressor = compressor; + if (AutoClose == false && ( +#ifdef HAVE_ZLIB + compressor.Name == "gzip" || +#endif +#ifdef HAVE_BZ2 + compressor.Name == "bzip2" || +#endif + false)) + { + // Need to duplicate fd here or gz/bz2 close for cleanup will close the fd as well + int const internFd = dup(iFd); + if (internFd == -1) + return FileFdErrno("OpenInternDescriptor", _("Could not open file descriptor %d"), iFd); + iFd = internFd; + } } #ifdef HAVE_ZLIB -- cgit v1.2.3 From 69d6988a1914881952c013cb63b4d835c3db0db7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 9 Jun 2013 14:32:48 +0200 Subject: refactor setup of file opening via zlib/bz2 lib Git-Dch: Ignore --- apt-pkg/contrib/fileutl.cc | 73 +++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 2188f616a..057cb6a94 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1089,19 +1089,32 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C if (compressor.Name == "." || compressor.Binary.empty() == true) return true; +#if defined HAVE_ZLIB || defined HAVE_BZ2 + // the API to open files is similar, so setup to avoid code duplicates later + // and while at it ensure that we close before opening (if its a reopen) + void* (*compress_open)(int, const char *) = NULL; +#define APT_COMPRESS_INIT(NAME,OPEN,CLOSE,STRUCT) \ + if (compressor.Name == NAME) \ + { \ + compress_open = (void*(*)(int, const char *)) OPEN; \ + if (d != NULL && STRUCT != NULL) { CLOSE(STRUCT); STRUCT = NULL; } \ + } +#ifdef HAVE_ZLIB + APT_COMPRESS_INIT("gzip", gzdopen, gzclose, d->gz) +#endif +#ifdef HAVE_BZ2 + APT_COMPRESS_INIT("bzip2", BZ2_bzdopen, BZ2_bzclose, d->bz2) +#endif +#undef APT_COMPRESS_INIT +#endif + if (d == NULL) { d = new FileFdPrivate(); d->openmode = Mode; d->compressor = compressor; - if (AutoClose == false && ( -#ifdef HAVE_ZLIB - compressor.Name == "gzip" || -#endif -#ifdef HAVE_BZ2 - compressor.Name == "bzip2" || -#endif - false)) +#if defined HAVE_ZLIB || defined HAVE_BZ2 + if (AutoClose == false && compress_open != NULL) { // Need to duplicate fd here or gz/bz2 close for cleanup will close the fd as well int const internFd = dup(iFd); @@ -1109,44 +1122,30 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C return FileFdErrno("OpenInternDescriptor", _("Could not open file descriptor %d"), iFd); iFd = internFd; } +#endif } -#ifdef HAVE_ZLIB - if (compressor.Name == "gzip") +#if defined HAVE_ZLIB || defined HAVE_BZ2 + if (compress_open != NULL) { - if (d->gz != NULL) - { - gzclose(d->gz); - d->gz = NULL; - } + void* compress_struct = NULL; if ((Mode & ReadWrite) == ReadWrite) - d->gz = gzdopen(iFd, "r+"); + compress_struct = compress_open(iFd, "r+"); else if ((Mode & WriteOnly) == WriteOnly) - d->gz = gzdopen(iFd, "w"); + compress_struct = compress_open(iFd, "w"); else - d->gz = gzdopen(iFd, "r"); - if (d->gz == NULL) + compress_struct = compress_open(iFd, "r"); + if (compress_struct == NULL) return false; - Flags |= Compressed; - return true; - } + +#ifdef HAVE_ZLIB + if (compressor.Name == "gzip") + d->gz = (gzFile) compress_struct; #endif #ifdef HAVE_BZ2 - if (compressor.Name == "bzip2") - { - if (d->bz2 != NULL) - { - BZ2_bzclose(d->bz2); - d->bz2 = NULL; - } - if ((Mode & ReadWrite) == ReadWrite) - d->bz2 = BZ2_bzdopen(iFd, "r+"); - else if ((Mode & WriteOnly) == WriteOnly) - d->bz2 = BZ2_bzdopen(iFd, "w"); - else - d->bz2 = BZ2_bzdopen(iFd, "r"); - if (d->bz2 == NULL) - return false; + if (compressor.Name == "bzip2") + d->bz2 = (BZFILE*) compress_struct; +#endif Flags |= Compressed; return true; } -- cgit v1.2.3 From 3dcdc1f91a5646f882940ff055b972d6b31a0ba5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Mar 2014 13:31:41 +0100 Subject: factor out getting list of architectures from comma list Beside fixing this minor code duplication it also resolves the problem of messing up vim syntax-highlighting. Git-Dch: Ignore --- test/integration/framework | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 1ab421c4c..00c8f3abc 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -259,6 +259,10 @@ getarchitectures() { echo "$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')" } +getarchitecturesfromcommalist() { + echo "$1" | sed -e 's#,#\n#g' | sed -e "s/^native\$/$(getarchitecture 'native')/" +} + configarchitecture() { { echo "APT::Architecture \"$(getarchitecture $1)\";" @@ -432,7 +436,7 @@ Package: $NAME" >> ${BUILDDIR}/debian/control # fi done - for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do + for arch in $(getarchitecturesfromcommalist "$ARCH"); do rm -rf ${BUILDDIR}/debian/tmp mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} @@ -587,7 +591,7 @@ insertpackage() { something went horribly wrong! They are autogenerated und used only by testcases and surf no other propose…"}" local ARCHS="" - for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do + for arch in $(getarchitecturesfromcommalist "$ARCH"); do if [ "$arch" = 'all' -o "$arch" = 'none' ]; then ARCHS="$(getarchitectures)" else @@ -649,7 +653,7 @@ insertinstalledpackage() { local FILE='rootdir/var/lib/dpkg/status' local INFO='rootdir/var/lib/dpkg/info' - for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do + for arch in $(getarchitecturesfromcommalist "$ARCH"); do echo "Package: $NAME Status: $STATUS Priority: $PRIORITY @@ -943,8 +947,7 @@ acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom downloadfile() { local PROTO="$(echo "$1" | cut -d':' -f 1 )" - apthelper -o Acquire::https::CaInfo=${TESTDIR}/apt.pem \ - -o Debug::Acquire::${PROTO}=1 \ + apthelper -o Debug::Acquire::${PROTO}=1 \ download-file "$1" "$2" 2>&1 || true # only if the file exists the download was successful if [ -e "$2" ]; then -- cgit v1.2.3 From 36e7727f70cde14b95f72029a9e2663672ef4da8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Mar 2014 13:36:08 +0100 Subject: ensure that gz compression test is run with gz The framework can be configured to use different compression algorithms to test different ones, but a testcase testing for gz support should always be run with gz, regardless of what compressions are configured otherwise. Git-Dch: Ignore --- test/integration/test-compressed-indexes | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes index c6f5ab49e..67ca0ba27 100755 --- a/test/integration/test-compressed-indexes +++ b/test/integration/test-compressed-indexes @@ -5,6 +5,7 @@ TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment +configcompression '.' 'gz' # only gz is supported for this, so ensure it is used configarchitecture "i386" buildsimplenativepackage "testpkg" "i386" "1.0" -- cgit v1.2.3 From 0ec6b98b24939100a6d4c333abe5bc62a4455f9f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Mar 2014 14:24:41 +0100 Subject: add a config option to switch uncompress methods to compress Not very useful in the normal operation of work, but handy for tests. Git-Dch: Ignore --- methods/gzip.cc | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/methods/gzip.cc b/methods/gzip.cc index ace5e9f71..df3f8828f 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -11,6 +11,7 @@ // Include Files /*{{{*/ #include <config.h> +#include <apt-pkg/configuration.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> @@ -60,17 +61,25 @@ bool GzipMethod::Fetch(FetchItem *Itm) return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog); // Open the source and destination files - FileFd From; - From.Open(Path, FileFd::ReadOnly, *compressor); - - if(From.FileSize() == 0) - return _error->Error(_("Empty files can't be valid archives")); - - FileFd To(Itm->DestFile,FileFd::WriteAtomic); + FileFd From, To; + if (_config->FindB("Method::Compress", false) == false) + { + From.Open(Path, FileFd::ReadOnly, *compressor); + if(From.FileSize() == 0) + return _error->Error(_("Empty files can't be valid archives")); + To.Open(Itm->DestFile, FileFd::WriteAtomic); + } + else + { + From.Open(Path, FileFd::ReadOnly); + To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor); + } To.EraseOnFailure(); - if (_error->PendingError() == true) + + if (From.IsOpen() == false || From.Failed() == true || + To.IsOpen() == false || To.Failed() == true) return false; - + // Read data from source, generate checksums and write Hashes Hash; bool Failed = false; -- cgit v1.2.3 From 7f350a377e0c65a656b9b5437e27d037fd742901 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Mar 2014 14:39:18 +0100 Subject: use liblzma-dev to provide xz/lzma support We have xz/lzma support for a while, but only via an external binary provided by xz-utils. Now that the Debian archive provides xz by default and dpkg pre-depends on the library provided by liblzma-dev we can switch now to use this library as well to avoid requiring an external binary. For now the binary is in a prio:required package, but this might change in the future. API wise it is quiet similar to bz2 code expect that it doesn't provide file I/O methods, so we piece this together on our own. --- apt-pkg/aptconfiguration.cc | 8 ++ apt-pkg/contrib/fileutl.cc | 280 ++++++++++++++++++++++++++++++++++++++------ apt-pkg/makefile | 3 + buildlib/config.h.in | 3 + buildlib/environment.mak.in | 1 + configure.ac | 7 ++ debian/control | 8 +- 7 files changed, 271 insertions(+), 39 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 941a9c334..6ba047560 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -462,8 +462,16 @@ const Configuration::getCompressors(bool const Cached) { #endif if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true) compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4)); +#ifdef HAVE_LZMA + else + compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 4)); +#endif if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true) compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",5)); +#ifdef HAVE_LZMA + else + compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 5)); +#endif std::vector<std::string> const comp = _config->FindVector("APT::Compressor"); for (std::vector<std::string>::const_iterator c = comp.begin(); diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 057cb6a94..22730ec04 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -58,6 +58,9 @@ #ifdef HAVE_BZ2 #include <bzlib.h> #endif +#ifdef HAVE_LZMA + #include <lzma.h> +#endif #ifdef WORDS_BIGENDIAN #include <inttypes.h> @@ -72,13 +75,47 @@ class FileFdPrivate { public: #ifdef HAVE_ZLIB gzFile gz; -#else - void* gz; #endif #ifdef HAVE_BZ2 BZFILE* bz2; -#else - void* bz2; +#endif +#ifdef HAVE_LZMA + struct LZMAFILE { + FILE* file; + uint8_t buffer[4096]; + lzma_stream stream; + lzma_ret err; + bool eof; + bool compressing; + + LZMAFILE() : file(NULL), eof(false), compressing(false) {} + ~LZMAFILE() { + if (compressing == true) + { + for (;;) { + stream.avail_out = sizeof(buffer)/sizeof(buffer[0]); + stream.next_out = buffer; + err = lzma_code(&stream, LZMA_FINISH); + if (err != LZMA_OK && err != LZMA_STREAM_END) + { + _error->Error("~LZMAFILE: Compress finalisation failed"); + break; + } + size_t const n = sizeof(buffer)/sizeof(buffer[0]) - stream.avail_out; + if (n && fwrite(buffer, 1, n, file) != n) + { + _error->Errno("~LZMAFILE",_("Write error")); + break; + } + if (err == LZMA_STREAM_END) + break; + } + } + lzma_end(&stream); + fclose(file); + } + }; + LZMAFILE* lzma; #endif int compressed_fd; pid_t compressor_pid; @@ -86,7 +123,16 @@ class FileFdPrivate { APT::Configuration::Compressor compressor; unsigned int openmode; unsigned long long seekpos; - FileFdPrivate() : gz(NULL), bz2(NULL), + FileFdPrivate() : +#ifdef HAVE_ZLIB + gz(NULL), +#endif +#ifdef HAVE_BZ2 + bz2(NULL), +#endif +#ifdef HAVE_LZMA + lzma(NULL), +#endif compressed_fd(-1), compressor_pid(-1), pipe(false), openmode(0), seekpos(0) {}; bool CloseDown(std::string const &FileName) @@ -106,6 +152,12 @@ class FileFdPrivate { BZ2_bzclose(bz2); bz2 = NULL; } +#endif +#ifdef HAVE_LZMA + if (lzma != NULL) { + delete lzma; + lzma = NULL; + } #endif if (compressor_pid > 0) ExecWait(compressor_pid, "FileFdCompressor", true); @@ -1089,12 +1141,14 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C if (compressor.Name == "." || compressor.Binary.empty() == true) return true; -#if defined HAVE_ZLIB || defined HAVE_BZ2 +#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA // the API to open files is similar, so setup to avoid code duplicates later // and while at it ensure that we close before opening (if its a reopen) void* (*compress_open)(int, const char *) = NULL; + if (false) + /* dummy so that the rest can be 'else if's */; #define APT_COMPRESS_INIT(NAME,OPEN,CLOSE,STRUCT) \ - if (compressor.Name == NAME) \ + else if (compressor.Name == NAME) \ { \ compress_open = (void*(*)(int, const char *)) OPEN; \ if (d != NULL && STRUCT != NULL) { CLOSE(STRUCT); STRUCT = NULL; } \ @@ -1105,6 +1159,17 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C #ifdef HAVE_BZ2 APT_COMPRESS_INIT("bzip2", BZ2_bzdopen, BZ2_bzclose, d->bz2) #endif +#ifdef HAVE_LZMA + else if (compressor.Name == "xz" || compressor.Name == "lzma") + { + compress_open = (void*(*)(int, const char*)) fdopen; + if (d != NULL && d->lzma != NULL) + { + delete d->lzma; + d->lzma = NULL; + } + } +#endif #undef APT_COMPRESS_INIT #endif @@ -1113,7 +1178,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C d = new FileFdPrivate(); d->openmode = Mode; d->compressor = compressor; -#if defined HAVE_ZLIB || defined HAVE_BZ2 +#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA if (AutoClose == false && compress_open != NULL) { // Need to duplicate fd here or gz/bz2 close for cleanup will close the fd as well @@ -1125,7 +1190,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C #endif } -#if defined HAVE_ZLIB || defined HAVE_BZ2 +#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA if (compress_open != NULL) { void* compress_struct = NULL; @@ -1138,13 +1203,60 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C if (compress_struct == NULL) return false; + if (false) + /* dummy so that the rest can be 'else if's */; #ifdef HAVE_ZLIB - if (compressor.Name == "gzip") + else if (compressor.Name == "gzip") d->gz = (gzFile) compress_struct; #endif #ifdef HAVE_BZ2 - if (compressor.Name == "bzip2") + else if (compressor.Name == "bzip2") d->bz2 = (BZFILE*) compress_struct; +#endif +#ifdef HAVE_LZMA + else if (compressor.Name == "xz" || compressor.Name == "lzma") + { + uint32_t const xzlevel = 6; + uint64_t const memlimit = UINT64_MAX; + if (d->lzma == NULL) + d->lzma = new FileFdPrivate::LZMAFILE; + d->lzma->file = (FILE*) compress_struct; + d->lzma->stream = LZMA_STREAM_INIT; + + if ((Mode & ReadWrite) == ReadWrite) + return FileFdError("ReadWrite mode is not supported for file %s", FileName.c_str()); + + if ((Mode & WriteOnly) == WriteOnly) + { + if (compressor.Name == "xz") + { + if (lzma_easy_encoder(&d->lzma->stream, xzlevel, LZMA_CHECK_CRC32) != LZMA_OK) + return false; + } + else + { + lzma_options_lzma options; + lzma_lzma_preset(&options, xzlevel); + if (lzma_alone_encoder(&d->lzma->stream, &options) != LZMA_OK) + return false; + } + d->lzma->compressing = true; + } + else + { + if (compressor.Name == "xz") + { + if (lzma_auto_decoder(&d->lzma->stream, memlimit, 0) != LZMA_OK) + return false; + } + else + { + if (lzma_alone_decoder(&d->lzma->stream, memlimit) != LZMA_OK) + return false; + } + d->lzma->compressing = false; + } + } #endif Flags |= Compressed; return true; @@ -1202,7 +1314,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C } else { - if (FileName.empty() == true) + if (d->compressed_fd != -1) dup2(d->compressed_fd,STDIN_FILENO); dup2(Pipe[1],STDOUT_FILENO); } @@ -1271,24 +1383,55 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) *((char *)To) = '\0'; do { + if (false) + /* dummy so that the rest can be 'else if's */; #ifdef HAVE_ZLIB - if (d != NULL && d->gz != NULL) + else if (d != NULL && d->gz != NULL) Res = gzread(d->gz,To,Size); - else #endif #ifdef HAVE_BZ2 - if (d != NULL && d->bz2 != NULL) + else if (d != NULL && d->bz2 != NULL) Res = BZ2_bzread(d->bz2,To,Size); - else #endif +#ifdef HAVE_LZMA + else if (d != NULL && d->lzma != NULL) + { + if (d->lzma->eof == true) + break; + + d->lzma->stream.next_out = (uint8_t *) To; + d->lzma->stream.avail_out = Size; + if (d->lzma->stream.avail_in == 0) + { + d->lzma->stream.next_in = d->lzma->buffer; + d->lzma->stream.avail_in = fread(d->lzma->buffer, 1, sizeof(d->lzma->buffer)/sizeof(d->lzma->buffer[0]), d->lzma->file); + } + d->lzma->err = lzma_code(&d->lzma->stream, LZMA_RUN); + if (d->lzma->err == LZMA_STREAM_END) + { + d->lzma->eof = true; + Res = Size - d->lzma->stream.avail_out; + } + else if (d->lzma->err != LZMA_OK) + { + Res = -1; + errno = 0; + } + else + Res = Size - d->lzma->stream.avail_out; + } +#endif + else Res = read(iFd,To,Size); if (Res < 0) { if (errno == EINTR) continue; + if (false) + /* dummy so that the rest can be 'else if's */; #ifdef HAVE_ZLIB - if (d != NULL && d->gz != NULL) + else if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); @@ -1297,13 +1440,17 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) } #endif #ifdef HAVE_BZ2 - if (d != NULL && d->bz2 != NULL) + else if (d != NULL && d->bz2 != NULL) { int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); if (err != BZ_IO_ERROR) return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg); } +#endif +#ifdef HAVE_LZMA + else if (d != NULL && d->lzma != NULL) + return FileFdError("lzma_read: %s (%d)", _("Read error"), d->lzma->err); #endif return FileFdErrno("read",_("Read error")); } @@ -1368,23 +1515,45 @@ bool FileFd::Write(const void *From,unsigned long long Size) errno = 0; do { + if (false) + /* dummy so that the rest can be 'else if's */; #ifdef HAVE_ZLIB - if (d != NULL && d->gz != NULL) - Res = gzwrite(d->gz,From,Size); - else + else if (d != NULL && d->gz != NULL) + Res = gzwrite(d->gz,From,Size); #endif #ifdef HAVE_BZ2 - if (d != NULL && d->bz2 != NULL) - Res = BZ2_bzwrite(d->bz2,(void*)From,Size); - else + else if (d != NULL && d->bz2 != NULL) + Res = BZ2_bzwrite(d->bz2,(void*)From,Size); #endif - Res = write(iFd,From,Size); +#ifdef HAVE_LZMA + else if (d != NULL && d->lzma != NULL) + { + d->lzma->stream.next_in = (uint8_t *)From; + d->lzma->stream.avail_in = Size; + d->lzma->stream.next_out = d->lzma->buffer; + d->lzma->stream.avail_out = sizeof(d->lzma->buffer)/sizeof(d->lzma->buffer[0]); + d->lzma->err = lzma_code(&d->lzma->stream, LZMA_RUN); + if (d->lzma->err != LZMA_OK) + return false; + size_t const n = sizeof(d->lzma->buffer)/sizeof(d->lzma->buffer[0]) - d->lzma->stream.avail_out; + size_t const m = (n == 0) ? 0 : fwrite(d->lzma->buffer, 1, n, d->lzma->file); + if (m != n) + Res = -1; + else + Res = Size - d->lzma->stream.avail_in; + } +#endif + else + Res = write(iFd,From,Size); + if (Res < 0 && errno == EINTR) continue; if (Res < 0) { + if (false) + /* dummy so that the rest can be 'else if's */; #ifdef HAVE_ZLIB - if (d != NULL && d->gz != NULL) + else if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); @@ -1393,13 +1562,17 @@ bool FileFd::Write(const void *From,unsigned long long Size) } #endif #ifdef HAVE_BZ2 - if (d != NULL && d->bz2 != NULL) + else if (d != NULL && d->bz2 != NULL) { int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); if (err != BZ_IO_ERROR) return FileFdError("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg); } +#endif +#ifdef HAVE_LZMA + else if (d != NULL && d->lzma != NULL) + return FileFdErrno("lzma_fwrite", _("Write error")); #endif return FileFdErrno("write",_("Write error")); } @@ -1447,6 +1620,9 @@ bool FileFd::Seek(unsigned long long To) if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 || d->bz2 != NULL +#endif +#ifdef HAVE_LZMA + || d->lzma != NULL #endif )) { @@ -1459,12 +1635,21 @@ bool FileFd::Seek(unsigned long long To) if ((d->openmode & ReadOnly) != ReadOnly) return FileFdError("Reopen is only implemented for read-only files!"); + if (false) + /* dummy so that the rest can be 'else if's */; #ifdef HAVE_BZ2 - if (d->bz2 != NULL) - { - BZ2_bzclose(d->bz2); - d->bz2 = NULL; - } + else if (d->bz2 != NULL) + { + BZ2_bzclose(d->bz2); + d->bz2 = NULL; + } +#endif +#ifdef HAVE_LZMA + else if (d->lzma != NULL) + { + delete d->lzma; + d->lzma = NULL; + } #endif if (iFd != -1) close(iFd); @@ -1514,6 +1699,9 @@ bool FileFd::Skip(unsigned long long Over) if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 || d->bz2 != NULL +#endif +#ifdef HAVE_LZMA + || d->lzma != NULL #endif )) { @@ -1552,8 +1740,18 @@ bool FileFd::Truncate(unsigned long long To) // truncating /dev/null is always successful - as we get an error otherwise if (To == 0 && FileName == "/dev/null") return true; -#if defined HAVE_ZLIB || defined HAVE_BZ2 - if (d != NULL && (d->gz != NULL || d->bz2 != NULL)) +#if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA + if (d != NULL && ( +#ifdef HAVE_ZLIB + d->gz != NULL || +#endif +#ifdef HAVE_BZ2 + d->bz2 != NULL || +#endif +#ifdef HAVE_LZMA + d->lzma != NULL || +#endif + false)) return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str()); #endif if (ftruncate(iFd,To) != 0) @@ -1574,6 +1772,9 @@ unsigned long long FileFd::Tell() if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 || d->bz2 != NULL +#endif +#ifdef HAVE_LZMA + || d->lzma != NULL #endif )) return d->seekpos; @@ -1653,6 +1854,9 @@ unsigned long long FileFd::Size() if (d != NULL && (d->pipe == true #ifdef HAVE_BZ2 || (d->bz2 && size > 0) +#endif +#ifdef HAVE_LZMA + || (d->lzma && size > 0) #endif )) { @@ -1797,7 +2001,13 @@ bool FileFd::FileFdError(const char *Description,...) { } /*}}}*/ -gzFile FileFd::gzFd() { return d->gz; } +APT_DEPRECATED gzFile FileFd::gzFd() { +#ifdef HAVE_ZLIB + return d->gz; +#else + return NULL; +#endif +} // Glob - wrapper around "glob()" /*{{{*/ diff --git a/apt-pkg/makefile b/apt-pkg/makefile index a90131f80..1d456873b 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -21,6 +21,9 @@ endif ifeq ($(HAVE_BZ2),yes) SLIBS+= -lbz2 endif +ifeq ($(HAVE_LZMA),yes) +SLIBS+= -llzma +endif APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) # Source code for the contributed non-core things diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 6779e07bc..6b72fb393 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -11,6 +11,9 @@ /* Define if we have the bz2 library for bzip2 */ #undef HAVE_BZ2 +/* Define if we have the lzma library for lzma/xz */ +#undef HAVE_LZMA + /* These two are used by the statvfs shim for glibc2.0 and bsd */ /* Define if we have sys/vfs.h */ #undef HAVE_VFS_H diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 9cc449573..c1bf29672 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -61,6 +61,7 @@ INTLLIBS = @INTLLIBS@ HAVE_STATVFS = @HAVE_STATVFS@ HAVE_ZLIB = @HAVE_ZLIB@ HAVE_BZ2 = @HAVE_BZ2@ +HAVE_LZMA = @HAVE_LZMA@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ # Shared library things diff --git a/configure.ac b/configure.ac index 40556ee54..4f782f873 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,13 @@ if test "x$HAVE_BZ2" = "xyes"; then AC_DEFINE(HAVE_BZ2) fi +HAVE_LZMA=no +AC_CHECK_LIB(lzma, lzma_easy_encoder,[AC_CHECK_HEADER(lzma.h, [HAVE_LZMA=yes], [])], []) +AC_SUBST(HAVE_LZMA) +if test "x$HAVE_LZMA" = "xyes"; then + AC_DEFINE(HAVE_LZMA) +fi + dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. dnl First check against the full canonical canoncial-system-type in $target diff --git a/debian/control b/debian/control index 5ce68414e..cb6f9b995 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,9 @@ Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org> Standards-Version: 3.9.5 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), - zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, - po4a (>= 0.34-2), autotools-dev, autoconf, automake + zlib1g-dev, libbz2-dev, liblzma-dev, + xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), + autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz Build-Conflicts: autoconf2.13, automake1.4 Vcs-Git: git://anonscm.debian.org/apt/apt.git @@ -41,7 +42,7 @@ Package: libapt-pkg4.12 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, xz-utils +Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~) Section: libs Description: package management runtime library @@ -107,7 +108,6 @@ Description: documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: xz-utils Description: package management related utility programs This package contains some less used commandline utilities related to package management with APT. -- cgit v1.2.3 From 4239dbca053512b6f8357ed143c24c50685b890f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Wed, 12 Mar 2014 16:16:14 +0100 Subject: refactor FileFd to hide some #ifdefs They tend to be ugly to look at, so hide them. Git-Dch: Ignore --- apt-pkg/contrib/fileutl.cc | 299 ++++++++++++++++++++------------------------- 1 file changed, 131 insertions(+), 168 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 22730ec04..26945c183 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: fileutl.cc,v 1.42 2002/09/14 05:29:22 jgg Exp $ /* ###################################################################### File Utilities @@ -59,6 +58,7 @@ #include <bzlib.h> #endif #ifdef HAVE_LZMA + #include <stdint.h> #include <lzma.h> #endif @@ -71,103 +71,6 @@ using namespace std; -class FileFdPrivate { - public: -#ifdef HAVE_ZLIB - gzFile gz; -#endif -#ifdef HAVE_BZ2 - BZFILE* bz2; -#endif -#ifdef HAVE_LZMA - struct LZMAFILE { - FILE* file; - uint8_t buffer[4096]; - lzma_stream stream; - lzma_ret err; - bool eof; - bool compressing; - - LZMAFILE() : file(NULL), eof(false), compressing(false) {} - ~LZMAFILE() { - if (compressing == true) - { - for (;;) { - stream.avail_out = sizeof(buffer)/sizeof(buffer[0]); - stream.next_out = buffer; - err = lzma_code(&stream, LZMA_FINISH); - if (err != LZMA_OK && err != LZMA_STREAM_END) - { - _error->Error("~LZMAFILE: Compress finalisation failed"); - break; - } - size_t const n = sizeof(buffer)/sizeof(buffer[0]) - stream.avail_out; - if (n && fwrite(buffer, 1, n, file) != n) - { - _error->Errno("~LZMAFILE",_("Write error")); - break; - } - if (err == LZMA_STREAM_END) - break; - } - } - lzma_end(&stream); - fclose(file); - } - }; - LZMAFILE* lzma; -#endif - int compressed_fd; - pid_t compressor_pid; - bool pipe; - APT::Configuration::Compressor compressor; - unsigned int openmode; - unsigned long long seekpos; - FileFdPrivate() : -#ifdef HAVE_ZLIB - gz(NULL), -#endif -#ifdef HAVE_BZ2 - bz2(NULL), -#endif -#ifdef HAVE_LZMA - lzma(NULL), -#endif - compressed_fd(-1), compressor_pid(-1), pipe(false), - openmode(0), seekpos(0) {}; - bool CloseDown(std::string const &FileName) - { - bool Res = true; -#ifdef HAVE_ZLIB - if (gz != NULL) { - int const e = gzclose(gz); - gz = NULL; - // gzdclose() on empty files always fails with "buffer error" here, ignore that - if (e != 0 && e != Z_BUF_ERROR) - Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str()); - } -#endif -#ifdef HAVE_BZ2 - if (bz2 != NULL) { - BZ2_bzclose(bz2); - bz2 = NULL; - } -#endif -#ifdef HAVE_LZMA - if (lzma != NULL) { - delete lzma; - lzma = NULL; - } -#endif - if (compressor_pid > 0) - ExecWait(compressor_pid, "FileFdCompressor", true); - compressor_pid = -1; - - return Res; - } - ~FileFdPrivate() { CloseDown(""); } -}; - // RunScripts - Run a set of scripts from a configuration subtree /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -932,6 +835,122 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) } /*}}}*/ +class FileFdPrivate { /*{{{*/ + public: +#ifdef HAVE_ZLIB + gzFile gz; +#endif +#ifdef HAVE_BZ2 + BZFILE* bz2; +#endif +#ifdef HAVE_LZMA + struct LZMAFILE { + FILE* file; + uint8_t buffer[4096]; + lzma_stream stream; + lzma_ret err; + bool eof; + bool compressing; + + LZMAFILE() : file(NULL), eof(false), compressing(false) {} + ~LZMAFILE() { + if (compressing == true) + { + for (;;) { + stream.avail_out = sizeof(buffer)/sizeof(buffer[0]); + stream.next_out = buffer; + err = lzma_code(&stream, LZMA_FINISH); + if (err != LZMA_OK && err != LZMA_STREAM_END) + { + _error->Error("~LZMAFILE: Compress finalisation failed"); + break; + } + size_t const n = sizeof(buffer)/sizeof(buffer[0]) - stream.avail_out; + if (n && fwrite(buffer, 1, n, file) != n) + { + _error->Errno("~LZMAFILE",_("Write error")); + break; + } + if (err == LZMA_STREAM_END) + break; + } + } + lzma_end(&stream); + fclose(file); + } + }; + LZMAFILE* lzma; +#endif + int compressed_fd; + pid_t compressor_pid; + bool pipe; + APT::Configuration::Compressor compressor; + unsigned int openmode; + unsigned long long seekpos; + FileFdPrivate() : +#ifdef HAVE_ZLIB + gz(NULL), +#endif +#ifdef HAVE_BZ2 + bz2(NULL), +#endif +#ifdef HAVE_LZMA + lzma(NULL), +#endif + compressed_fd(-1), compressor_pid(-1), pipe(false), + openmode(0), seekpos(0) {}; + bool InternalClose(std::string const &FileName) + { + if (false) + /* dummy so that the rest can be 'else if's */; +#ifdef HAVE_ZLIB + else if (gz != NULL) { + int const e = gzclose(gz); + gz = NULL; + // gzdclose() on empty files always fails with "buffer error" here, ignore that + if (e != 0 && e != Z_BUF_ERROR) + return _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str()); + } +#endif +#ifdef HAVE_BZ2 + else if (bz2 != NULL) { + BZ2_bzclose(bz2); + bz2 = NULL; + } +#endif +#ifdef HAVE_LZMA + else if (lzma != NULL) { + delete lzma; + lzma = NULL; + } +#endif + return true; + } + bool CloseDown(std::string const &FileName) + { + bool const Res = InternalClose(FileName); + + if (compressor_pid > 0) + ExecWait(compressor_pid, "FileFdCompressor", true); + compressor_pid = -1; + + return Res; + } + bool InternalStream() const { + return false +#ifdef HAVE_BZ2 + || bz2 != NULL +#endif +#ifdef HAVE_LZMA + || lzma != NULL +#endif + ; + } + + + ~FileFdPrivate() { CloseDown(""); } +}; + /*}}}*/ // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ @@ -1147,28 +1166,21 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C void* (*compress_open)(int, const char *) = NULL; if (false) /* dummy so that the rest can be 'else if's */; -#define APT_COMPRESS_INIT(NAME,OPEN,CLOSE,STRUCT) \ +#define APT_COMPRESS_INIT(NAME,OPEN) \ else if (compressor.Name == NAME) \ { \ compress_open = (void*(*)(int, const char *)) OPEN; \ - if (d != NULL && STRUCT != NULL) { CLOSE(STRUCT); STRUCT = NULL; } \ + if (d != NULL) d->InternalClose(FileName); \ } #ifdef HAVE_ZLIB - APT_COMPRESS_INIT("gzip", gzdopen, gzclose, d->gz) + APT_COMPRESS_INIT("gzip", gzdopen) #endif #ifdef HAVE_BZ2 - APT_COMPRESS_INIT("bzip2", BZ2_bzdopen, BZ2_bzclose, d->bz2) + APT_COMPRESS_INIT("bzip2", BZ2_bzdopen) #endif #ifdef HAVE_LZMA - else if (compressor.Name == "xz" || compressor.Name == "lzma") - { - compress_open = (void*(*)(int, const char*)) fdopen; - if (d != NULL && d->lzma != NULL) - { - delete d->lzma; - d->lzma = NULL; - } - } + APT_COMPRESS_INIT("xz", fdopen) + APT_COMPRESS_INIT("lzma", fdopen) #endif #undef APT_COMPRESS_INIT #endif @@ -1617,14 +1629,7 @@ bool FileFd::Write(int Fd, const void *From, unsigned long long Size) /* */ bool FileFd::Seek(unsigned long long To) { - if (d != NULL && (d->pipe == true -#ifdef HAVE_BZ2 - || d->bz2 != NULL -#endif -#ifdef HAVE_LZMA - || d->lzma != NULL -#endif - )) + if (d != NULL && (d->pipe == true || d->InternalStream() == true)) { // Our poor man seeking in pipes is costly, so try to avoid it unsigned long long seekpos = Tell(); @@ -1635,22 +1640,7 @@ bool FileFd::Seek(unsigned long long To) if ((d->openmode & ReadOnly) != ReadOnly) return FileFdError("Reopen is only implemented for read-only files!"); - if (false) - /* dummy so that the rest can be 'else if's */; -#ifdef HAVE_BZ2 - else if (d->bz2 != NULL) - { - BZ2_bzclose(d->bz2); - d->bz2 = NULL; - } -#endif -#ifdef HAVE_LZMA - else if (d->lzma != NULL) - { - delete d->lzma; - d->lzma = NULL; - } -#endif + d->InternalClose(FileName); if (iFd != -1) close(iFd); iFd = -1; @@ -1696,14 +1686,7 @@ bool FileFd::Seek(unsigned long long To) /* */ bool FileFd::Skip(unsigned long long Over) { - if (d != NULL && (d->pipe == true -#ifdef HAVE_BZ2 - || d->bz2 != NULL -#endif -#ifdef HAVE_LZMA - || d->lzma != NULL -#endif - )) + if (d != NULL && (d->pipe == true || d->InternalStream() == true)) { d->seekpos += Over; char buffer[1024]; @@ -1741,17 +1724,11 @@ bool FileFd::Truncate(unsigned long long To) if (To == 0 && FileName == "/dev/null") return true; #if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA - if (d != NULL && ( + if (d != NULL && (d->InternalStream() == true #ifdef HAVE_ZLIB - d->gz != NULL || -#endif -#ifdef HAVE_BZ2 - d->bz2 != NULL || + || d->gz != NULL #endif -#ifdef HAVE_LZMA - d->lzma != NULL || -#endif - false)) + )) return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str()); #endif if (ftruncate(iFd,To) != 0) @@ -1769,14 +1746,7 @@ unsigned long long FileFd::Tell() // seeking around, but not all users of FileFd use always Seek() and co // so d->seekpos isn't always true and we can just use it as a hint if // we have nothing else, but not always as an authority… - if (d != NULL && (d->pipe == true -#ifdef HAVE_BZ2 - || d->bz2 != NULL -#endif -#ifdef HAVE_LZMA - || d->lzma != NULL -#endif - )) + if (d != NULL && (d->pipe == true || d->InternalStream() == true)) return d->seekpos; off_t Res; @@ -1851,14 +1821,7 @@ unsigned long long FileFd::Size() // for compressor pipes st_size is undefined and at 'best' zero, // so we 'read' the content and 'seek' back - see there - if (d != NULL && (d->pipe == true -#ifdef HAVE_BZ2 - || (d->bz2 && size > 0) -#endif -#ifdef HAVE_LZMA - || (d->lzma && size > 0) -#endif - )) + if (d != NULL && (d->pipe == true || (d->InternalStream() == true && size > 0))) { unsigned long long const oldSeek = Tell(); char ignore[1000]; -- cgit v1.2.3 From 40f8a8ba8c2e7ff9ce80781250c863c07ac130dd Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Thu, 13 Mar 2014 01:27:34 +0100 Subject: use the pretty fullname of a pkg as download desciption Otherwise the "WARNING: The following packages cannot be authenticated!" messages does not include the architecture of the package, so it would be slightly misinformative. --- apt-pkg/acquire-item.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ad38e3116..30743addf 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1865,7 +1865,7 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, _error->Error(_("I wasn't able to locate a file for the %s package. " "This might mean you need to manually fix this package. " "(due to missing arch)"), - Version.ParentPkg().Name()); + Version.ParentPkg().FullName().c_str()); return; } @@ -1993,7 +1993,7 @@ bool pkgAcqArchive::QueueNext() Desc.URI = Index->ArchiveURI(PkgFile); Desc.Description = Index->ArchiveInfo(Version); Desc.Owner = this; - Desc.ShortDesc = Version.ParentPkg().Name(); + Desc.ShortDesc = Version.ParentPkg().FullName(true); // See if we already have the file. (Legacy filenames) FileSize = Version->Size; @@ -2060,10 +2060,6 @@ bool pkgAcqArchive::QueueNext() // Create the item Local = false; - Desc.URI = Index->ArchiveURI(PkgFile); - Desc.Description = Index->ArchiveInfo(Version); - Desc.Owner = this; - Desc.ShortDesc = Version.ParentPkg().Name(); QueueURI(Desc); ++Vf; -- cgit v1.2.3 From e4215120275e5c8766f58bc87ce828142e2f96f1 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 14 Mar 2014 09:42:41 +0100 Subject: add debian/apt.install to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2c619ab57..488682ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ /cmdline/apt-key /doc/apt-vendor.ent /doc/examples/sources.list +/debian/apt.install /debian/libapt-pkg*.install /debian/libapt-inst*.install /debian/libapt-pkg-dev.install -- cgit v1.2.3 From 7ffbb4759cc744ccaa97e67558f1c810e4734437 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 14 Mar 2014 09:42:46 +0100 Subject: prepare 0.9.16 release --- configure.ac | 2 +- debian/changelog | 37 ++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 321 +++++++------ doc/po/de.po | 347 ++++++++------ doc/po/es.po | 347 ++++++++------ doc/po/fr.po | 348 ++++++++------ doc/po/it.po | 347 ++++++++------ doc/po/ja.po | 346 ++++++++------ doc/po/pl.po | 354 ++++++++------ doc/po/pt.po | 347 ++++++++------ doc/po/pt_BR.po | 325 +++++++------ po/ar.po | 1268 ++++++++++++++++++++++++------------------------- po/ast.po | 1271 ++++++++++++++++++++++++------------------------- po/bg.po | 1268 ++++++++++++++++++++++++------------------------- po/bs.po | 1270 ++++++++++++++++++++++++------------------------- po/ca.po | 1268 ++++++++++++++++++++++++------------------------- po/cs.po | 1268 ++++++++++++++++++++++++------------------------- po/cy.po | 1270 ++++++++++++++++++++++++------------------------- po/da.po | 1280 ++++++++++++++++++++++++------------------------- po/de.po | 1268 ++++++++++++++++++++++++------------------------- po/dz.po | 1270 ++++++++++++++++++++++++------------------------- po/el.po | 1268 ++++++++++++++++++++++++------------------------- po/es.po | 1268 ++++++++++++++++++++++++------------------------- po/eu.po | 1268 ++++++++++++++++++++++++------------------------- po/fi.po | 1268 ++++++++++++++++++++++++------------------------- po/fr.po | 1277 ++++++++++++++++++++++++------------------------- po/gl.po | 1268 ++++++++++++++++++++++++------------------------- po/hu.po | 1268 ++++++++++++++++++++++++------------------------- po/it.po | 1281 +++++++++++++++++++++++++------------------------- po/ja.po | 1277 ++++++++++++++++++++++++------------------------- po/km.po | 1270 ++++++++++++++++++++++++------------------------- po/ko.po | 1268 ++++++++++++++++++++++++------------------------- po/ku.po | 1268 ++++++++++++++++++++++++------------------------- po/lt.po | 1268 ++++++++++++++++++++++++------------------------- po/mr.po | 1268 ++++++++++++++++++++++++------------------------- po/nb.po | 1268 ++++++++++++++++++++++++------------------------- po/ne.po | 1270 ++++++++++++++++++++++++------------------------- po/nl.po | 1268 ++++++++++++++++++++++++------------------------- po/nn.po | 1268 ++++++++++++++++++++++++------------------------- po/pl.po | 1268 ++++++++++++++++++++++++------------------------- po/pt.po | 1268 ++++++++++++++++++++++++------------------------- po/pt_BR.po | 1268 ++++++++++++++++++++++++------------------------- po/ro.po | 1268 ++++++++++++++++++++++++------------------------- po/ru.po | 1268 ++++++++++++++++++++++++------------------------- po/sk.po | 1268 ++++++++++++++++++++++++------------------------- po/sl.po | 1268 ++++++++++++++++++++++++------------------------- po/sv.po | 1268 ++++++++++++++++++++++++------------------------- po/th.po | 1268 ++++++++++++++++++++++++------------------------- po/tl.po | 1268 ++++++++++++++++++++++++------------------------- po/tr.po | 1268 ++++++++++++++++++++++++------------------------- po/uk.po | 1268 ++++++++++++++++++++++++------------------------- po/vi.po | 1279 ++++++++++++++++++++++++------------------------- po/zh_CN.po | 1268 ++++++++++++++++++++++++------------------------- po/zh_TW.po | 1268 ++++++++++++++++++++++++------------------------- 55 files changed, 29085 insertions(+), 28629 deletions(-) diff --git a/configure.ac b/configure.ac index 4f782f873..b161d31be 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.5" +PACKAGE_VERSION="0.9.16~20140314" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index d12e7071f..03a99f38d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +apt (0.9.16) unstable; urgency=medium + + [ Michael Vogt ] + * add hashsum support in apt-helper download-file and + add more tests + + [ Trần Ngọc Quân ] + * l10n: vi.po (624t): Update Vietnamese translation + + [ David Kalnischkies ] + * propagate a negative score point along breaks/conflicts + * check version before adding scores in resolver + * autogenerate makefile for vendor system + * add default and override handling for Cnf::FindVector + * support DEB_BUILD_PROFILES and -P for build profiles + * do not configure already unpacked packages needlessly (Closes: 740843) + * if mountpoint has a ".disk" directory it is mounted + * no error for non-existing mountpoints in MountCdrom + * apt-cdrom ident shouldn't be interactive (Closes: 740673) + * support very long mtab entries in mountpoint discovery + * msgstr with elipses need three dots + * cmdline parsing: apt-config is not apt-cdrom + * use a configurable list of versioned kernel packages + * support kfreebsd and hurd in the kernel hook + * add ".*-{kernel,modules}-$KERVER" matcher for hook + * ensure that a dot is a dot in the hook + * use liblzma-dev to provide xz/lzma support + * use the pretty fullname of a pkg as download desciption + + [ Johannes Schauer ] + * implement BuildProfileSpec support as dpkg has in 1.17.2 (Closes: 661537) + + [ Wojciech Górski ] + * fix polish --install-suggests text in apt-get manpage (Closes: 741056) + + -- Michael Vogt <mvo@debian.org> Fri, 14 Mar 2014 09:45:05 +0100 + apt (0.9.15.5) unstable; urgency=medium [ Michael Vogt ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 75aa02c8f..fdc63ab1a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15.5"> +<!ENTITY apt-product-version "0.9.16~20140314"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 11df9dc23..2067216e9 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.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -935,18 +935,28 @@ msgid "" "are satisfied. By default is it not set which means that the host " "architecture is the same as the build architecture (which is defined by " "<literal>APT::Architecture</literal>). Configuration Item: " -"<literal>APT::Get::Host-Architecture</literal>" +"<literal>APT::Get::Host-Architecture</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 +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:385 +#: apt-get.8.xml:396 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 " @@ -955,7 +965,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -967,7 +977,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with " "<literal>install</literal>, <literal>no-upgrade</literal> will prevent " @@ -976,7 +986,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with " "<literal>install</literal>, <literal>only-upgrade</literal> will install " @@ -986,7 +996,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -996,7 +1006,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1009,7 +1019,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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 " @@ -1019,14 +1029,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 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:451 +#: apt-get.8.xml:462 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 " @@ -1037,7 +1047,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:461 +#: apt-get.8.xml:472 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 " @@ -1052,7 +1062,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where " @@ -1062,14 +1072,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 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:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or " "<literal>remove</literal>, then this option acts like running the " @@ -1078,7 +1088,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 msgid "" "Only has meaning for the <literal>source</literal> and " "<literal>build-dep</literal> commands. Indicates that the given source " @@ -1090,7 +1100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, " @@ -1099,14 +1109,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:524 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:518 +#: apt-get.8.xml:529 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: " @@ -1114,7 +1124,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1124,17 +1134,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:558 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:1215 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:548 +#: apt-get.8.xml:559 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " @@ -1142,12 +1152,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -2465,7 +2475,16 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by " +"&dpkg-buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -2474,14 +2493,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -2490,7 +2509,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -2505,7 +2524,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -2522,7 +2541,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -2533,7 +2552,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -2546,7 +2565,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -2567,38 +2586,38 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -2606,7 +2625,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -2619,7 +2638,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -2631,7 +2650,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -2643,7 +2662,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -2651,7 +2670,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -2663,7 +2682,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -2673,21 +2692,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP " "URIs. It is in the standard form of " @@ -2700,7 +2719,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -2712,14 +2731,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial " @@ -2731,14 +2750,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -2748,7 +2767,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -2756,7 +2775,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -2770,7 +2789,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -2781,7 +2800,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -2805,7 +2824,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of " @@ -2826,7 +2845,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -2836,7 +2855,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the " @@ -2846,7 +2865,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -2856,13 +2875,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -2875,7 +2894,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is " "<literal>gpgv::Options</literal>, which passes additional parameters to " @@ -2883,7 +2902,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -2891,7 +2910,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -2903,19 +2922,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -2933,13 +2952,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -2955,7 +2974,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -2963,7 +2982,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -2972,7 +2991,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -2984,13 +3003,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: it " @@ -3012,7 +3031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -3022,22 +3041,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -3049,7 +3068,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -3062,7 +3081,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -3072,7 +3091,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -3080,7 +3099,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -3092,7 +3111,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -3105,7 +3124,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -3116,12 +3135,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -3129,7 +3148,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, " @@ -3143,40 +3162,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -3184,7 +3203,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -3193,7 +3212,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -3204,7 +3223,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -3213,7 +3232,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -3224,7 +3243,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> " @@ -3235,26 +3254,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -3269,7 +3288,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -3279,7 +3298,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -3293,7 +3312,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -3306,7 +3325,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is " @@ -3324,7 +3343,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure " "--pending</command> to let &dpkg; handle all required configurations and " @@ -3336,7 +3355,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -3347,7 +3366,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -3359,7 +3378,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -3373,12 +3392,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -3387,12 +3406,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -3403,7 +3422,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -3411,7 +3430,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -3419,7 +3438,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -3429,65 +3448,65 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -3495,52 +3514,52 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -3550,7 +3569,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -3568,45 +3587,45 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -3614,19 +3633,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -3634,7 +3653,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index b5868a20c..6d9189fc9 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -1310,13 +1310,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" "Diese Option steuert, wie die Architekturpakete durch <command>apt-get " "source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten erfüllt " @@ -1327,6 +1335,30 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" +msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" +"Diese Option steuert, wie die Architekturpakete durch <command>apt-get " +"source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten erfüllt " +"werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass die " +"Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch " +"<literal>APT::Architecture</literal>) definiert wird). " +"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1335,7 +1367,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:385 +#: apt-get.8.xml:396 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 " @@ -1349,7 +1381,7 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1369,7 +1401,7 @@ msgstr "" "wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1383,7 +1415,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1397,7 +1429,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -1412,7 +1444,7 @@ msgstr "" "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1434,7 +1466,7 @@ msgstr "" "Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1447,7 +1479,7 @@ msgstr "" "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1456,7 +1488,7 @@ msgstr "" "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:451 +#: apt-get.8.xml:462 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 " @@ -1474,7 +1506,7 @@ msgstr "" "Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:461 +#: apt-get.8.xml:472 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 " @@ -1499,7 +1531,7 @@ msgstr "" "auch die &apt-preferences;-Handbuchseite." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1513,7 +1545,7 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1522,7 +1554,7 @@ msgstr "" "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1536,7 +1568,7 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 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 " @@ -1555,7 +1587,7 @@ msgstr "" "Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1567,7 +1599,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:524 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1576,7 +1608,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:518 +#: apt-get.8.xml:529 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::" @@ -1588,7 +1620,7 @@ msgstr "" # FIXME s/Item/Items/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1604,22 +1636,22 @@ msgstr "" "<literal>Dpkg::Progress-Fancy</literal>." #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "Dateien" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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 "Siehe auch" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:559 #, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " @@ -1635,14 +1667,14 @@ msgstr "" "preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -3504,7 +3536,16 @@ msgstr "" "print-architectures</command> registriert werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3517,7 +3558,7 @@ msgstr "" "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3526,7 +3567,7 @@ msgstr "" "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3541,7 +3582,7 @@ msgstr "" "Möglichkeiten bereitstellt, um sie erneut zu installieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3569,7 +3610,7 @@ msgstr "" "Abhängigkeit von A nicht länger erfüllt wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3599,7 +3640,7 @@ msgstr "" "Stelle verhindern kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3617,7 +3658,7 @@ msgstr "" "des Upgrade-Prozesses arbeiten können." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3639,7 +3680,7 @@ msgstr "" "davon abhängt, sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3676,13 +3717,13 @@ msgstr "" "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" "definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3692,7 +3733,7 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3702,7 +3743,7 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3712,12 +3753,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "Die Erwerbgruppe" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3728,7 +3769,7 @@ msgstr "" "Herunterladen selbst zuständig sind (siehe auch &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3750,7 +3791,7 @@ msgstr "" "ValidTime</literal> unten benutzt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3769,7 +3810,7 @@ msgstr "" "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3789,7 +3830,7 @@ msgstr "" "Optionsnamen vorgenommen werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3800,7 +3841,7 @@ msgstr "" "der kompletten Dateien. Vorgabe ist True." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3818,7 +3859,7 @@ msgstr "" "komplette Datei anstelle der Patche heruntergeladen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3834,7 +3875,7 @@ msgstr "" "URI-Art geöffnet wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3843,7 +3884,7 @@ msgstr "" "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3853,7 +3894,7 @@ msgstr "" "kopiert zu werden. True ist die Vorgabe." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3872,7 +3913,7 @@ msgstr "" "wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3893,7 +3934,7 @@ msgstr "" "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3903,7 +3944,7 @@ msgstr "" "Datenzeitüberschreitungen angewandt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3923,7 +3964,7 @@ msgstr "" "HTTP/1.1-Spezifikation entsprechen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3932,7 +3973,7 @@ msgstr "" "folgen wird, was standardmäßig aktiviert ist." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes per second. The default " @@ -3948,7 +3989,7 @@ msgstr "" "Zeit deaktiviert." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3960,7 +4001,7 @@ msgstr "" "bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -3983,7 +4024,7 @@ msgstr "" "dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -4000,7 +4041,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -4041,7 +4082,7 @@ msgstr "" "Rechner ist <literal><host>::SslForceVersion</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -4076,7 +4117,7 @@ msgstr "" "literal> und <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -4093,7 +4134,7 @@ msgstr "" "Musterkonfigurationsdatei)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4107,7 +4148,7 @@ msgstr "" "Effizienz nicht empfohlen FTP über HTTP zu benutzen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4123,13 +4164,13 @@ msgstr "" "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4151,7 +4192,7 @@ msgstr "" "Aushängebefehle können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4160,13 +4201,13 @@ msgstr "" "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4186,19 +4227,19 @@ msgstr "" "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4230,13 +4271,13 @@ msgstr "" "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4262,7 +4303,7 @@ msgstr "" "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4274,7 +4315,7 @@ msgstr "" "dies meist nur für lokale Spiegel benutzt werden kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4288,7 +4329,7 @@ msgstr "" "False." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4308,13 +4349,13 @@ msgstr "" "langen Sprachcodes selten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4355,7 +4396,7 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4369,22 +4410,22 @@ msgstr "" "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "Beim Herunterladen wird die Verwendung des IPv4-Protokolls erzwungen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "Beim Herunterladen wird die Verwendung des IPv6-Protokolls erzwungen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4404,7 +4445,7 @@ msgstr "" "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4427,7 +4468,7 @@ msgstr "" "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4442,7 +4483,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4454,7 +4495,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4472,7 +4513,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4492,7 +4533,7 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4510,12 +4551,12 @@ msgstr "" "diese Muster verwandt werden." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4526,7 +4567,7 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4549,7 +4590,7 @@ msgstr "" "vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4558,7 +4599,7 @@ msgstr "" "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4567,7 +4608,7 @@ msgstr "" "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4576,12 +4617,12 @@ msgstr "" "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "Wie APT &dpkg; aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4590,7 +4631,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4601,7 +4642,7 @@ msgstr "" "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4615,7 +4656,7 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4634,7 +4675,7 @@ msgstr "" "übergeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4647,7 +4688,7 @@ msgstr "" "Version die Architektur und den <literal>MultiArch</literal>-Schalter hinzu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -4665,7 +4706,7 @@ msgstr "" "bietet." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -4683,7 +4724,7 @@ msgstr "" "verwendeten Dateideskriptors als eine Bestätigung." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4692,7 +4733,7 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4702,12 +4743,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4734,7 +4775,7 @@ msgstr "" "Pakete konfiguriert werden." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4748,7 +4789,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4773,7 +4814,7 @@ msgstr "" "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4796,7 +4837,7 @@ msgstr "" "anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4826,7 +4867,7 @@ msgstr "" "enden könnte und möglicherweise nicht mehr startbar ist." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4845,7 +4886,7 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4861,7 +4902,7 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4879,7 +4920,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4903,12 +4944,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4922,12 +4963,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4945,7 +4986,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4956,7 +4997,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4967,7 +5008,7 @@ msgstr "" "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4979,7 +5020,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4988,12 +5029,12 @@ msgstr "" "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -5001,28 +5042,28 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "" "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -5031,7 +5072,7 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -5040,13 +5081,13 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -5055,7 +5096,7 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5066,7 +5107,7 @@ msgstr "" "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -5076,14 +5117,14 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" "protokolliert, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -5092,7 +5133,7 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -5101,7 +5142,7 @@ msgstr "" "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -5111,7 +5152,7 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -5119,7 +5160,7 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -5129,7 +5170,7 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5145,7 +5186,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5178,7 +5219,7 @@ msgstr "" "dem das Paket erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5188,7 +5229,7 @@ msgstr "" "sind, aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5197,7 +5238,7 @@ msgstr "" "und alle während deren Auswertung gefundenen Fehler aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5207,7 +5248,7 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -5215,12 +5256,12 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "gibt die Priorität jeder Paketliste beim Start aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5230,7 +5271,7 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5242,7 +5283,7 @@ msgstr "" "Marker</literal> beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5251,13 +5292,13 @@ msgstr "" "filename> gelesenen Anbieter aus." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5267,7 +5308,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/es.po b/doc/po/es.po index 5811d09da..e863bd8be 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -1386,13 +1386,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" "Esta opción controla la arquitectura para la que se construyen los paquetes " "mediante <command>apt-get source --compile</command> y cómo se satisfacen " @@ -1403,6 +1411,30 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" +msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" +"Esta opción controla la arquitectura para la que se construyen los paquetes " +"mediante <command>apt-get source --compile</command> y cómo se satisfacen " +"las dependencias cruzadas de construcción. No se define por omisión, lo que " +"implica que la arquitectura anfitrión es la misma que la de construcción " +"(definida con <literal>APT::Architecture</literal>). Opción de " +"configuración: <literal>APT::Get::Host-Architecture</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1411,7 +1443,7 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:385 +#: apt-get.8.xml:396 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 " @@ -1425,7 +1457,7 @@ msgstr "" "Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1437,7 +1469,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1450,7 +1482,7 @@ msgstr "" "configuración: <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1464,7 +1496,7 @@ msgstr "" "<literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -1480,7 +1512,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1502,7 +1534,7 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1516,7 +1548,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1526,7 +1558,7 @@ msgstr "" "ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:451 +#: apt-get.8.xml:462 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 " @@ -1544,7 +1576,7 @@ msgstr "" "<literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:461 +#: apt-get.8.xml:472 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 " @@ -1568,7 +1600,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:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1582,7 +1614,7 @@ msgstr "" "<literal>APT::Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1591,7 +1623,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:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1604,7 +1636,7 @@ msgstr "" "Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 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 " @@ -1624,7 +1656,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1635,7 +1667,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:513 +#: apt-get.8.xml:524 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1644,7 +1676,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:518 +#: apt-get.8.xml:529 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::" @@ -1655,7 +1687,7 @@ msgstr "" "configuración: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1665,22 +1697,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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 "Véase también" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:559 #, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " @@ -1696,14 +1728,14 @@ msgstr "" "preferences;, el Cómo de APT." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -3551,7 +3583,16 @@ msgstr "" "add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3565,7 +3606,7 @@ msgstr "" "«5.0*». Consulte también &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3574,7 +3615,7 @@ msgstr "" "problemas ignore los paquetes retenidos en la toma de decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3588,7 +3629,7 @@ msgstr "" "mecanismo directo para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3615,7 +3656,7 @@ msgstr "" "del paquete A, ya que no se satisface la dependencia sobre éste." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3644,7 +3685,7 @@ msgstr "" "anteriormente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3661,7 +3702,7 @@ msgstr "" "para que así pueden mejorar y corregir el proceso de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3682,7 +3723,7 @@ msgstr "" "sobre la que estos paquetes dependen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3719,14 +3760,14 @@ msgstr "" "desactiva el crecimiento automático de la caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Define los paquetes que se consideran dependencias de construcción " "esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3735,7 +3776,7 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3744,7 +3785,7 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3753,12 +3794,12 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3769,7 +3810,7 @@ msgstr "" "sí mismo (consulte también &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3790,7 +3831,7 @@ msgstr "" "utilizar la opción <literal>Max-ValidTime</literal> a continuación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3809,7 +3850,7 @@ msgstr "" "se pueden realizar añadiendo la etiqueta del archivo al nombre de opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3829,7 +3870,7 @@ msgstr "" "y deben utilizar añadiendo la etiqueta del archivo al nombre de opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3840,7 +3881,7 @@ msgstr "" "enteros. Su valor predeterminado es «true»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3858,7 +3899,7 @@ msgstr "" "parches." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3873,7 +3914,7 @@ msgstr "" "se abrirá una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3882,7 +3923,7 @@ msgstr "" "intentar obtener los ficheros fallidos el número de veces proporcionado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3892,7 +3933,7 @@ msgstr "" "«true» de forma predeterminada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3912,7 +3953,7 @@ msgstr "" "opciones anteriores." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3931,7 +3972,7 @@ msgstr "" "impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3941,7 +3982,7 @@ msgstr "" "y a la recepción de datos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3961,7 +4002,7 @@ msgstr "" "cumplir la especificación HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3970,7 +4011,7 @@ msgstr "" "redirección; activado por omisión." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 #, fuzzy #| msgid "" #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" @@ -3992,7 +4033,7 @@ msgstr "" "implícitamente la descarga simultánea desde varios servidores)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4003,7 +4044,7 @@ msgstr "" "permiten el acceso para clientes que usan un identificador conocido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -4017,7 +4058,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -4034,7 +4075,7 @@ msgstr "" "<literal>Pipeline-Depth</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -4074,7 +4115,7 @@ msgstr "" "SslForceVersion</literal> es la opción correspondiente para cada servidor." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -4107,7 +4148,7 @@ msgstr "" "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -4124,7 +4165,7 @@ msgstr "" "ejemplos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4138,7 +4179,7 @@ msgstr "" "a su poca eficiencia." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4154,13 +4195,13 @@ msgstr "" "compatibles con la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"algo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4182,7 +4223,7 @@ msgstr "" "especificar órdenes para desmontar mediante UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4191,13 +4232,13 @@ msgstr "" "Options</literal>, que introduce parámetros adicionales a gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4217,19 +4258,19 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4261,13 +4302,13 @@ msgstr "" "explícita ya que se añadirá de forma automática." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4292,7 +4333,7 @@ msgstr "" "omite la lista definida, simplemente prefija la lista con este tipo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4304,7 +4345,7 @@ msgstr "" "así que habitualmente esto solo sirve con réplicas locales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4318,7 +4359,7 @@ msgstr "" "paquetes locales. El valor predeterminado es «false»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4337,13 +4378,13 @@ msgstr "" "idioma (especialmente para los códigos de idioma largos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4382,7 +4423,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4396,22 +4437,22 @@ msgstr "" "implícito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4432,7 +4473,7 @@ msgstr "" "filename> ó <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4454,7 +4495,7 @@ msgstr "" "directorio predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4470,7 +4511,7 @@ msgstr "" "<envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4481,7 +4522,7 @@ msgstr "" "Al finalizar este proceso carga el fichero de configuración principal." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4498,7 +4539,7 @@ msgstr "" "literal> especifican la ubicación de sus respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4519,7 +4560,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4537,12 +4578,12 @@ msgstr "" "de expresiones regulares." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4553,7 +4594,7 @@ msgstr "" "encuentran en la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4575,7 +4616,7 @@ msgstr "" "realiza esta acción antes de descargar paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4584,7 +4625,7 @@ msgstr "" "la línea de ordenes al ejecutar la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4593,7 +4634,7 @@ msgstr "" "la línea de ordenes al ejecutar la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4603,12 +4644,12 @@ msgstr "" "preguntará en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "Invocación de APT a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4617,7 +4658,7 @@ msgstr "" "se encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4628,7 +4669,7 @@ msgstr "" "introduce a &dpkg; como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4641,7 +4682,7 @@ msgstr "" "sh</filename>; en caso de fallo, APT cancela la acción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 #, fuzzy #| msgid "" #| "This is a list of shell commands to run before invoking &dpkg;. Like " @@ -4665,7 +4706,7 @@ msgstr "" "la entrada estándar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 #, fuzzy #| msgid "" #| "Version 2 of this protocol dumps more information, including the protocol " @@ -4687,7 +4728,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -4698,7 +4739,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -4709,7 +4750,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4718,7 +4759,7 @@ msgstr "" "predeterminado es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4728,12 +4769,12 @@ msgstr "" "paquetes y a producir todos los binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4760,7 +4801,7 @@ msgstr "" "tiempo (o más) durante la configuración de todos los paquetes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4774,7 +4815,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4798,7 +4839,7 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4821,7 +4862,7 @@ msgstr "" "eliminación." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4851,7 +4892,7 @@ msgstr "" "imposibilidad de arrancar el sistema. " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4869,7 +4910,7 @@ msgstr "" "desactivar esta opción en todas las ejecuciones menos la última." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4885,7 +4926,7 @@ msgstr "" "los disparadores necesarios para configurar este paquete." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4903,7 +4944,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4928,12 +4969,12 @@ msgstr "" "<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "Las opciones «Periodic» y «Archives»" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4947,12 +4988,12 @@ msgstr "" "documentación de estas opciones." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "Opciones de depuración" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4969,7 +5010,7 @@ msgstr "" "para un usuario normal, aunque unas cuantas sí son:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4980,7 +5021,7 @@ msgstr "" "purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4991,7 +5032,7 @@ msgstr "" "<literal>apt-get -s install</literal>) como un usuario normal." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5003,7 +5044,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -5012,14 +5053,14 @@ msgstr "" "statfs en los identificadores de los discos ópticos." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "" "A continuación, se muestra la lista completa de las opciones de depuración " "de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -5027,26 +5068,26 @@ msgstr "" "<literal>cdrom://</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante " "HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -5055,7 +5096,7 @@ msgstr "" "criptográficas mediante <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -5064,14 +5105,14 @@ msgstr "" "paquetes almacenadas en CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Describe el proceso de resolución de dependencias de compilación en &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -5080,7 +5121,7 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5091,7 +5132,7 @@ msgstr "" "identificador de un CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -5101,14 +5142,14 @@ msgstr "" "a la vez." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra los elementos que se añaden o se borran de la cola de descarga " "global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -5118,7 +5159,7 @@ msgstr "" "ficheros descargados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -5127,7 +5168,7 @@ msgstr "" "lista de índices de paquetes, y los errores relacionados con éstos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -5137,7 +5178,7 @@ msgstr "" "índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -5145,7 +5186,7 @@ msgstr "" "descargas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -5154,7 +5195,7 @@ msgstr "" "de los paquetes y con la eliminación de los paquetes sin usar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5170,7 +5211,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5201,7 +5242,7 @@ msgstr "" "la sección en la que aparece el paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5210,7 +5251,7 @@ msgstr "" "invocó, con los argumentos separados por un espacio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5219,7 +5260,7 @@ msgstr "" "estado y cualquier error encontrado durante el análisis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5228,7 +5269,7 @@ msgstr "" "literal> debería entregar los paquetes a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -5236,12 +5277,12 @@ msgstr "" "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5250,7 +5291,7 @@ msgstr "" "lo que ocurre cuando se encuentra un problema de dependencias complejo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5261,7 +5302,7 @@ msgstr "" "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5270,13 +5311,13 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5286,7 +5327,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/fr.po b/doc/po/fr.po index c1340a9b9..eec809f97 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -1304,13 +1304,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" "Cette option contrôle comment les paquets d'architectures sont construits " "par <command>apt-get source --compile</command> et comment les dépendances " @@ -1322,6 +1330,31 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" +msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" +"Cette option contrôle comment les paquets d'architectures sont construits " +"par <command>apt-get source --compile</command> et comment les dépendances " +"de construction transverses sont respectées. Elle n'est pas positionnée par " +"défaut ce qui signifie que l'architecture hôte est la même que " +"l'architecture de construction (définie par <literal>APT::Architecture</" +"literal>). Élément de configuration : <literal>APT::Get::Host-Architecture</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1330,7 +1363,7 @@ msgstr "" "configuration : <literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:385 +#: apt-get.8.xml:396 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 " @@ -1344,7 +1377,7 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1356,7 +1389,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1369,7 +1402,7 @@ msgstr "" "Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1382,7 +1415,7 @@ msgstr "" "configuration : <literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -1398,7 +1431,7 @@ msgstr "" "yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1420,7 +1453,7 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1434,7 +1467,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1443,7 +1476,7 @@ msgstr "" "Élément de configuration : <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:451 +#: apt-get.8.xml:462 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 " @@ -1461,7 +1494,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:461 +#: apt-get.8.xml:472 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 " @@ -1483,7 +1516,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:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1497,7 +1530,7 @@ msgstr "" "Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1507,7 +1540,7 @@ msgstr "" "Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1520,7 +1553,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:496 +#: apt-get.8.xml:507 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 " @@ -1540,7 +1573,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1552,7 +1585,7 @@ msgstr "" "literal>, " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:524 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1562,7 +1595,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:518 +#: apt-get.8.xml:529 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::" @@ -1574,7 +1607,7 @@ msgstr "" "AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1584,22 +1617,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "Fichiers" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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 "Voir aussi" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:559 #, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " @@ -1615,14 +1648,14 @@ msgstr "" "« HOWTO » d'APT." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -3481,7 +3514,16 @@ msgstr "" "sont enregistrées avec <command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3495,7 +3537,7 @@ msgstr "" "&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3505,7 +3547,7 @@ msgstr "" "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3519,7 +3561,7 @@ msgstr "" "direct pour les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3546,7 +3588,7 @@ msgstr "" "dépendances ne sont pas satisfaites." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3575,7 +3617,7 @@ msgstr "" "le seul qu'elle permet d'éviter." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3593,7 +3635,7 @@ msgstr "" "corriger les processus de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3615,7 +3657,7 @@ msgstr "" "tous les paquets dont ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3655,14 +3697,14 @@ msgstr "" "l'augmentation automatique de la taille du cache est désactivée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Cette option définit les paquets qui sont considérés comme faisant partie " "des dépendances essentielles pour la construction de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3672,7 +3714,7 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3682,7 +3724,7 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3692,12 +3734,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3708,7 +3750,7 @@ msgstr "" "effectuent ce téléchargement (voir aussi &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3729,7 +3771,7 @@ msgstr "" "alors utilisée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3748,7 +3790,7 @@ msgstr "" "l'option." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3768,7 +3810,7 @@ msgstr "" "nom de l'option." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3779,7 +3821,7 @@ msgstr "" "filename>), plutôt que de les télécharger entièrement. Par défaut à « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3798,7 +3840,7 @@ msgstr "" "fichiers de différences." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3814,7 +3856,7 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3824,7 +3866,7 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3834,7 +3876,7 @@ msgstr "" "archives de sources au lieu de les copier. Par défaut à « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3855,7 +3897,7 @@ msgstr "" "options de mandataire HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3875,7 +3917,7 @@ msgstr "" "fichiers .deb très grands." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3885,7 +3927,7 @@ msgstr "" "connexion qu'aux données." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3905,7 +3947,7 @@ msgstr "" "qui ne respectent pas la norme HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3914,7 +3956,7 @@ msgstr "" "suive les redirections. Ce réglage est activé par défaut." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 #, fuzzy #| msgid "" #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" @@ -3936,7 +3978,7 @@ msgstr "" "implicitement le téléchargement simultané depuis plusieurs serveurs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3948,7 +3990,7 @@ msgstr "" "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -3962,7 +4004,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3979,7 +4021,7 @@ msgstr "" "literal> n'est pas encore gérée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -4012,7 +4054,7 @@ msgstr "" "<literal>TLSv1</literal> ou <literal>SSLv3</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -4048,7 +4090,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -4065,7 +4107,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4080,7 +4122,7 @@ msgstr "" "efficacité de cette méthode." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4096,13 +4138,13 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4125,7 +4167,7 @@ msgstr "" "<literal>UMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4134,13 +4176,13 @@ msgstr "" "permet de passer des paramètres à gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4160,19 +4202,19 @@ msgstr "" "type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4204,13 +4246,13 @@ msgstr "" "<literal>bz2</literal> à liste car il sera ajouté automatiquement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4237,7 +4279,7 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4249,7 +4291,7 @@ msgstr "" "surtout destiné aux miroirs locaux." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4264,7 +4306,7 @@ msgstr "" "(« False »)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4284,13 +4326,13 @@ msgstr "" "langues étant particulièrement rares." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4330,7 +4372,7 @@ msgstr "" "alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4344,22 +4386,22 @@ msgstr "" "(après un « <literal>none</literal> » implicite)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4379,7 +4421,7 @@ msgstr "" "<filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4402,7 +4444,7 @@ msgstr "" "Cache</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4417,7 +4459,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4428,7 +4470,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4446,7 +4488,7 @@ msgstr "" "programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4468,7 +4510,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4486,12 +4528,12 @@ msgstr "" "est possible d'utiliser la syntaxe des expressions rationnelles." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4502,7 +4544,7 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4525,7 +4567,7 @@ msgstr "" "avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4534,7 +4576,7 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4543,7 +4585,7 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4553,12 +4595,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4567,7 +4609,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4578,7 +4620,7 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4591,7 +4633,7 @@ msgstr "" "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 #, fuzzy #| msgid "" #| "This is a list of shell commands to run before invoking &dpkg;. Like " @@ -4615,7 +4657,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 #, fuzzy #| msgid "" #| "Version 2 of this protocol dumps more information, including the protocol " @@ -4637,7 +4679,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -4648,7 +4690,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -4659,7 +4701,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4668,7 +4710,7 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4678,14 +4720,14 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "" "utilisation des actions différées (« triggers ») de dpkg (et options " "associées)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4712,7 +4754,7 @@ msgstr "" "pendant la configuration des paquets." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4726,7 +4768,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4750,7 +4792,7 @@ msgstr "" "<placeholder type=\"literallayout\" id=\"0\"/>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4773,7 +4815,7 @@ msgstr "" "options « unpack » et « remove »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4803,7 +4845,7 @@ msgstr "" "configuré et donc éventuellement non amorçable." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4822,7 +4864,7 @@ msgstr "" "peut conserver l'option active." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4840,7 +4882,7 @@ msgstr "" "celles concernant le paquet en cours de traitement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4858,7 +4900,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4884,12 +4926,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4901,12 +4943,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4924,7 +4966,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4935,7 +4977,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4947,7 +4989,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4959,7 +5001,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4968,12 +5010,12 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "Liste complète des options de débogage de APT :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -4981,24 +5023,24 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "Print information related to downloading packages using HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -5007,7 +5049,7 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -5016,14 +5058,14 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Décrit le processus de résolution des dépendances pour la construction de " "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -5032,7 +5074,7 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5043,7 +5085,7 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -5053,14 +5095,14 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Trace les ajouts et suppressions d'éléments de la queue globale de " "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -5070,7 +5112,7 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -5080,7 +5122,7 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -5090,7 +5132,7 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -5098,7 +5140,7 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -5107,7 +5149,7 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5122,7 +5164,7 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5158,7 +5200,7 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5167,7 +5209,7 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5177,7 +5219,7 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5186,18 +5228,18 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "Affiche, au lancement, la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5206,7 +5248,7 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5217,7 +5259,7 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5226,13 +5268,13 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5242,7 +5284,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/it.po b/doc/po/it.po index dc179cde7..dc74eb25e 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -1353,13 +1353,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" "Questa opzione controlla l'architettura per la quale <command>apt-get source " "--compile</command> compila i pacchetti e come le dipendenze di compilazione " @@ -1370,6 +1378,30 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" +msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" +"Questa opzione controlla l'architettura per la quale <command>apt-get source " +"--compile</command> compila i pacchetti e come le dipendenze di compilazione " +"incrociata sono soddisfatte. In modo predefinito non è impostata, il che " +"significa che l'architettura ospite è la stessa dell'architettura di " +"compilazione (che è definita da <literal>APT::Architecture</literal>). Voce " +"di configurazione: <literal>APT::Get::Host-Architecture</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1378,7 +1410,7 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:385 +#: apt-get.8.xml:396 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 " @@ -1391,7 +1423,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:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1403,7 +1435,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1416,7 +1448,7 @@ msgstr "" "configurazione: <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1430,7 +1462,7 @@ msgstr "" "Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -1446,7 +1478,7 @@ msgstr "" "yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1467,7 +1499,7 @@ msgstr "" "configurazione: <literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1480,7 +1512,7 @@ msgstr "" "option>. Voce di configurazione: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1489,7 +1521,7 @@ msgstr "" "configurazione: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:451 +#: apt-get.8.xml:462 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 +1538,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:461 +#: apt-get.8.xml:472 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 +1562,7 @@ msgstr "" "pagina di manuale di &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1544,7 +1576,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1554,7 +1586,7 @@ msgstr "" "Get::Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1568,7 +1600,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 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 " @@ -1587,7 +1619,7 @@ msgstr "" "configurazione: <literal>APT::Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1598,7 +1630,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:513 +#: apt-get.8.xml:524 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1607,7 +1639,7 @@ msgstr "" "Voce di configurazione: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:518 +#: apt-get.8.xml:529 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::" @@ -1618,7 +1650,7 @@ msgstr "" "configurazione: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1628,22 +1660,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "File" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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 "Vedere anche" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:559 #, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " @@ -1659,14 +1691,14 @@ msgstr "" "preferences;, l'APT Howto." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -3519,7 +3551,16 @@ msgstr "" "quando sono registrate con <command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3533,7 +3574,7 @@ msgstr "" "preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3542,7 +3583,7 @@ msgstr "" "di problemi ignori i pacchetti bloccati nel suo processo decisionale." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3556,7 +3597,7 @@ msgstr "" "reinstallarli." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3583,7 +3624,7 @@ msgstr "" "che dipende da A, dato che la dipendenza da A non è più soddisfatta." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3613,7 +3654,7 @@ msgstr "" "l'unico problema che può aiutare a prevenire." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3631,7 +3672,7 @@ msgstr "" "il processo di aggiornamento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3652,7 +3693,7 @@ msgstr "" "<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3690,14 +3731,14 @@ msgstr "" "della cache è disabilitata." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Definisce quali pacchetti sono considerati dipendenze di compilazione " "essenziali." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3706,7 +3747,7 @@ msgstr "" "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3715,7 +3756,7 @@ msgstr "" "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3724,12 +3765,12 @@ msgstr "" "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "Il gruppo Acquire" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3740,7 +3781,7 @@ msgstr "" "scaricamento stesso (vedere anche &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3762,7 +3803,7 @@ msgstr "" "ValidTime</literal> seguente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3782,7 +3823,7 @@ msgstr "" "dell'archivio in fondo al nome dell'opzione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3802,7 +3843,7 @@ msgstr "" "archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3813,7 +3854,7 @@ msgstr "" "interamente i nuovi. Attiva in modo predefinito." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3831,7 +3872,7 @@ msgstr "" "completo invece delle patch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3846,7 +3887,7 @@ msgstr "" "literal> significa che viene aperta una connessione per ogni tipo di URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3856,7 +3897,7 @@ msgstr "" "ha avuto successo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3867,7 +3908,7 @@ msgstr "" "vero." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3886,7 +3927,7 @@ msgstr "" "la variabile d'ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3906,7 +3947,7 @@ msgstr "" "file .deb." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3916,7 +3957,7 @@ msgstr "" "quello per i dati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3936,7 +3977,7 @@ msgstr "" "con la specifica HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3945,7 +3986,7 @@ msgstr "" "meno le ridirezioni che sono abilitate in modo predefinito." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 #, fuzzy #| msgid "" #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" @@ -3967,7 +4008,7 @@ msgstr "" "scaricamento da più server contemporaneamente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3979,7 +4020,7 @@ msgstr "" "conosciuto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -3993,7 +4034,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -4010,7 +4051,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> non è ancora supportata." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -4051,7 +4092,7 @@ msgstr "" "literal> è la corrispondente opzione specifica per ciascun host." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -4085,7 +4126,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -4101,7 +4142,7 @@ msgstr "" "uno specifico host (vedere il file di configurazione d'esempio)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4115,7 +4156,7 @@ msgstr "" "a causa della sua bassa efficienza." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4131,13 +4172,13 @@ msgstr "" "parte dei server FTP non supporta la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"pippo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4159,7 +4200,7 @@ msgstr "" "comandi per lo smontaggio possono essere specificati usando UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4168,13 +4209,13 @@ msgstr "" "literal>, che passa parametri aggiuntivi a gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4193,19 +4234,19 @@ msgstr "" "metodo usato. La sintassi è: <placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4236,13 +4277,13 @@ msgstr "" "all'elenco, dato che verrà aggiunto automaticamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4268,7 +4309,7 @@ msgstr "" "definito; aggiunge solamente il tipo indicato all'inizio dell'elenco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4280,7 +4321,7 @@ msgstr "" "soprattutto per i mirror locali." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4294,7 +4335,7 @@ msgstr "" "modo predefinito è disabilitato." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4313,13 +4354,13 @@ msgstr "" "codici di lingua lunghi sono particolarmente rari." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"it\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4358,7 +4399,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4372,22 +4413,22 @@ msgstr "" "implicito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "Directory" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4407,7 +4448,7 @@ msgstr "" "<filename>/</filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4429,7 +4470,7 @@ msgstr "" "la directory predefinita è contenuta in <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4444,7 +4485,7 @@ msgstr "" "configurazione specificato da <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4455,7 +4496,7 @@ msgstr "" "termine viene caricato il file di configurazione principale." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4472,7 +4513,7 @@ msgstr "" "specificano la posizione dei rispettivi programmi." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4493,7 +4534,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4511,12 +4552,12 @@ msgstr "" "questi modelli possono usare una sintassi con espressioni regolari." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4527,7 +4568,7 @@ msgstr "" "sezione <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4549,7 +4590,7 @@ msgstr "" "scaricare i nuovi pacchetti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4559,7 +4600,7 @@ msgstr "" "installazione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4569,7 +4610,7 @@ msgstr "" "aggiornamento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4579,12 +4620,12 @@ msgstr "" "solo in caso di errore." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "Come APT invoca &dpkg;" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4593,7 +4634,7 @@ msgstr "" "&dpkg;; sono nella sezione <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4604,7 +4645,7 @@ msgstr "" "passata a &dpkg; come un singolo argomento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4617,7 +4658,7 @@ msgstr "" "bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 #, fuzzy #| msgid "" #| "This is a list of shell commands to run before invoking &dpkg;. Like " @@ -4641,7 +4682,7 @@ msgstr "" "uno per riga, sullo standard input." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 #, fuzzy #| msgid "" #| "Version 2 of this protocol dumps more information, including the protocol " @@ -4663,7 +4704,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -4674,7 +4715,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -4685,7 +4726,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4694,7 +4735,7 @@ msgstr "" "valore predefinito è <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4704,12 +4745,12 @@ msgstr "" "binari." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "Uso dei trigger di dpkg (e relative opzioni)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4737,7 +4778,7 @@ msgstr "" "pacchetti." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4751,7 +4792,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4775,7 +4816,7 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4797,7 +4838,7 @@ msgstr "" "questa opzione anche alle chiamate per lo spacchettamento e la rimozione." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4827,7 +4868,7 @@ msgstr "" "potrebbe finire in uno stato non configurato e potenzialmente non avviabile." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4845,7 +4886,7 @@ msgstr "" "si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4861,7 +4902,7 @@ msgstr "" "necessari per configurare il pacchetto in questione." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4879,7 +4920,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4904,12 +4945,12 @@ msgstr "" "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "Opzioni Periodic e Archives" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4923,12 +4964,12 @@ msgstr "" "all'inizio dello script." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "Opzioni di debug" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4946,7 +4987,7 @@ msgstr "" "esserlo:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4957,7 +4998,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4968,7 +5009,7 @@ msgstr "" "install</literal>) come utente non root." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4980,7 +5021,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4989,37 +5030,37 @@ msgstr "" "negli ID dei CD-ROM." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "Segue un elenco completo delle opzioni di debug per apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -5028,7 +5069,7 @@ msgstr "" "usando <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -5037,14 +5078,14 @@ msgstr "" "pacchetti memorizzati su CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -5053,7 +5094,7 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5064,7 +5105,7 @@ msgstr "" "system del CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -5074,14 +5115,14 @@ msgstr "" "contemporaneamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale " "degli scaricamenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -5090,7 +5131,7 @@ msgstr "" "codici di controllo e delle firme di cifratura dei file scaricati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -5100,7 +5141,7 @@ msgstr "" "diff." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -5110,7 +5151,7 @@ msgstr "" "invece degli indici completi." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -5118,7 +5159,7 @@ msgstr "" "realmente gli scaricamenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -5127,7 +5168,7 @@ msgstr "" "installato dei pacchetti e alla rimozione dei pacchetti non utilizzati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5143,7 +5184,7 @@ msgstr "" "pkgProblemResolver</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5175,7 +5216,7 @@ msgstr "" "sezione in cui compare il pacchetto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5184,7 +5225,7 @@ msgstr "" "gli argomenti separati da un singolo carattere di spazio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5193,7 +5234,7 @@ msgstr "" "di stato ed ogni errore incontrato durante la sua analisi." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5202,7 +5243,7 @@ msgstr "" "literal> deve passare i pacchetti a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -5210,12 +5251,12 @@ msgstr "" "nell'invocazione di &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5225,7 +5266,7 @@ msgstr "" "dipendenze)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5236,7 +5277,7 @@ msgstr "" "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5245,13 +5286,13 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Esempi" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5261,7 +5302,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/ja.po b/doc/po/ja.po index 1e11de559..1b0de29f2 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -1311,13 +1311,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" "このオプションは、<command>apt-get source --compile</command> で構築するパッ" "ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。" @@ -1327,6 +1335,29 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" +msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" +"このオプションは、<command>apt-get source --compile</command> で構築するパッ" +"ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。" +"デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::" +"Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり" +"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1335,7 +1366,7 @@ msgstr "" "Get::Compile</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:385 +#: apt-get.8.xml:396 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 " @@ -1348,7 +1379,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1360,7 +1391,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1373,7 +1404,7 @@ msgstr "" "Upgrade</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1386,7 +1417,7 @@ msgstr "" "定項目: <literal>APT::Get::Only-Upgrade</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -1400,7 +1431,7 @@ msgstr "" "ん! 設定項目: <literal>APT::Get::force-yes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1421,7 +1452,7 @@ msgstr "" "Print-URIs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1434,7 +1465,7 @@ msgstr "" "<literal>APT::Get::Purge</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1443,7 +1474,7 @@ msgstr "" "定項目: <literal>APT::Get::ReInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:451 +#: apt-get.8.xml:462 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 " @@ -1459,7 +1490,7 @@ msgstr "" "する時ぐらいでしょう。設定項目: <literal>APT::Get::List-Cleanup</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:461 +#: apt-get.8.xml:472 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 " @@ -1482,7 +1513,7 @@ msgstr "" "さい。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1495,7 +1526,7 @@ msgstr "" "目: <literal>APT::Get::Trivial-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1504,7 +1535,7 @@ msgstr "" "項目: <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1517,7 +1548,7 @@ msgstr "" "<literal>APT::Get::AutomaticRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 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 " @@ -1535,7 +1566,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1546,7 +1577,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:513 +#: apt-get.8.xml:524 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1555,7 +1586,7 @@ msgstr "" "<literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:518 +#: apt-get.8.xml:529 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::" @@ -1566,7 +1597,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1576,22 +1607,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "ファイル" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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:548 +#: apt-get.8.xml:559 #, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " @@ -1607,14 +1638,14 @@ msgstr "" "preferences;, APT Howto" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -3387,7 +3418,16 @@ msgstr "" "加します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3400,7 +3440,7 @@ msgstr "" "'4.0', '5.0*' となります。&apt-preferences; も参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3409,7 +3449,7 @@ msgstr "" "パッケージを無視します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3423,7 +3463,7 @@ msgstr "" "注意してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3447,7 +3487,7 @@ msgstr "" "なり、A への依存関係は、もう満たせません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3472,7 +3512,7 @@ msgstr "" "述のシナリオを解決する方法の、1つにしかすぎないのです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3488,7 +3528,7 @@ msgstr "" "も報告していただきたいです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3509,7 +3549,7 @@ msgstr "" "それらが依存しているパッケージ以外の不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3543,12 +3583,12 @@ msgstr "" "の自動増加を無効にします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3557,7 +3597,7 @@ msgstr "" "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3566,7 +3606,7 @@ msgstr "" "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3575,12 +3615,12 @@ msgstr "" "は &apt-cdrom; の文書を参照してください。" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3591,7 +3631,7 @@ msgstr "" "(&sources-list; も参照)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3611,7 +3651,7 @@ msgstr "" "下の <literal>Max-ValidTime</literal> オプションを使用できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3629,7 +3669,7 @@ msgstr "" "固有の設定を作成できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3647,7 +3687,7 @@ msgstr "" "定を作成できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3658,7 +3698,7 @@ msgstr "" "す。デフォルトでは True です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3674,7 +3714,7 @@ msgstr "" "も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3688,7 +3728,7 @@ msgstr "" "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3697,7 +3737,7 @@ msgstr "" "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3707,7 +3747,7 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3725,7 +3765,7 @@ msgstr "" "ないと、環境変数 <envar>http_proxy</envar> を使用します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3744,7 +3784,7 @@ msgstr "" "が汚れるのを防げます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3754,7 +3794,7 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3772,7 +3812,7 @@ msgstr "" "フォルト値は 0 (= 無効) です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3781,7 +3821,7 @@ msgstr "" "かどうかを制御します。デフォルトでは有効です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 #, fuzzy #| msgid "" #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" @@ -3802,7 +3842,7 @@ msgstr "" "ロードしなくなることに注意してください)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3813,7 +3853,7 @@ msgstr "" "ロードするための、異なる User-Agent を設定できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -3827,7 +3867,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3844,7 +3884,7 @@ msgstr "" "していません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -3882,7 +3922,7 @@ msgstr "" "ごとのオプションです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -3914,7 +3954,7 @@ msgstr "" "literal>, <literal>$(SITE_PORT)</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -3929,7 +3969,7 @@ msgstr "" "定例はサンプル設定ファイルを参照してください)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -3942,7 +3982,7 @@ msgstr "" "FTP over HTTP を使用するのは推奨しません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -3958,13 +3998,13 @@ msgstr "" "いことに注意してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -3985,7 +4025,7 @@ msgstr "" "マンドは UMount で指定することができます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -3994,13 +4034,13 @@ msgstr "" "る、<literal>gpgv::Options</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4018,19 +4058,19 @@ msgstr "" "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4059,13 +4099,13 @@ msgstr "" "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4089,7 +4129,7 @@ msgstr "" "のみ定義されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4100,7 +4140,7 @@ msgstr "" "んどローカルミラーでのみ有効になることに注意してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4113,7 +4153,7 @@ msgstr "" "する際に、CPU の能力を余計に消費します。デフォルトでは false です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4131,13 +4171,13 @@ msgstr "" "意してください。長い言語コードは特に見かけません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4174,7 +4214,7 @@ msgstr "" "ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4187,22 +4227,22 @@ msgstr "" "後) に追加します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "ディレクトリ" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4221,7 +4261,7 @@ msgstr "" "サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4242,7 +4282,7 @@ msgstr "" "様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4256,7 +4296,7 @@ msgstr "" "ファイルを指定された場合のみ、この設定の効果があります)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4267,7 +4307,7 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4284,7 +4324,7 @@ msgstr "" "プログラムの場所を指定します。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4304,7 +4344,7 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4320,12 +4360,12 @@ msgstr "" "フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "DSelect での APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4336,7 +4376,7 @@ msgstr "" "ます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4357,7 +4397,7 @@ msgstr "" "パッケージをダウンロードする直前に行います。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4366,7 +4406,7 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4375,7 +4415,7 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4384,12 +4424,12 @@ msgstr "" "します。デフォルトはエラーが発生した場合のみです。" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "APT が &dpkg; を呼ぶ方法" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4398,7 +4438,7 @@ msgstr "" "<literal>DPkg</literal> セクションにあります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4408,7 +4448,7 @@ msgstr "" "なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4420,7 +4460,7 @@ msgstr "" "bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 #, fuzzy #| msgid "" #| "This is a list of shell commands to run before invoking &dpkg;. Like " @@ -4443,7 +4483,7 @@ msgstr "" "マンドの標準入力に送ります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 #, fuzzy #| msgid "" #| "Version 2 of this protocol dumps more information, including the protocol " @@ -4464,7 +4504,7 @@ msgstr "" "Install-Pkgs</literal> で与えられるコマンドです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -4475,7 +4515,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -4486,7 +4526,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4495,7 +4535,7 @@ msgstr "" "<filename>/</filename> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4504,12 +4544,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "dpkg トリガの使い方 (および関連オプション)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4533,7 +4573,7 @@ msgstr "" "(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4547,7 +4587,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4570,7 +4610,7 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4590,7 +4630,7 @@ msgstr "" "在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4617,7 +4657,7 @@ msgstr "" "能性があるからです。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4634,7 +4674,7 @@ msgstr "" "では、最後以外のすべての実行で、無効にできます。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4649,7 +4689,7 @@ msgstr "" "ことに注意してください。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4667,7 +4707,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4690,12 +4730,12 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4708,12 +4748,12 @@ msgstr "" "トは、このスクリプトの先頭を参照してください。" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4729,7 +4769,7 @@ msgstr "" "のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4740,7 +4780,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4751,7 +4791,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4763,7 +4803,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4772,34 +4812,34 @@ msgstr "" "ないようにします。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "以下は apt に対するデバッグオプションのすべてです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -4807,7 +4847,7 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -4816,12 +4856,12 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -4829,7 +4869,7 @@ msgstr "" "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -4839,7 +4879,7 @@ msgstr "" "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -4848,13 +4888,13 @@ msgstr "" "<quote><literal>apt-get update</literal></quote> を実行できるようになります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -4863,7 +4903,7 @@ msgstr "" "ジやエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -4872,7 +4912,7 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -4881,14 +4921,14 @@ msgstr "" "リストへのパッチ適用に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -4897,7 +4937,7 @@ msgstr "" "に出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -4912,7 +4952,7 @@ msgstr "" "路に対応しています。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -4941,7 +4981,7 @@ msgstr "" "ます。<literal>section</literal> はパッケージが現れるセクション名です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -4950,7 +4990,7 @@ msgstr "" "切られます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -4959,7 +4999,7 @@ msgstr "" "を解析中に発生したエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -4968,18 +5008,18 @@ msgstr "" "のトレースを生成します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "起動時の各パッケージの優先度を表示します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -4988,7 +5028,7 @@ msgstr "" "した場合にのみ、適用されます)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -4999,7 +5039,7 @@ msgstr "" "説明したものと同じです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5008,13 +5048,13 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "サンプル" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5024,7 +5064,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/pl.po b/doc/po/pl.po index 981dc676c..9419613f2 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -1162,8 +1162,8 @@ msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" -"Uznaje sugerowane pakiety za zależności do instalacji. " -"Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Suggests</literal>." +"Uznaje sugerowane pakiety za zależności do instalacji. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Install-Suggests</literal>." # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1367,13 +1367,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" "Za pomocą tej opcji można określić architekturę pakietów budowanych przez " "<command>apt-get source --compile</command> i sposób, w jaki są spełniane " @@ -1383,9 +1391,34 @@ msgstr "" "Architecture</literal>). Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" "Host-Architecture</literal>." -# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" +msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" +"Za pomocą tej opcji można określić architekturę pakietów budowanych przez " +"<command>apt-get source --compile</command> i sposób, w jaki są spełniane " +"międzyarchitekturowe zależności czasu budowania. Domyślnie nie jest " +"ustawiona, co oznacza, że architektura budowanych pakietów jest taka sama " +"jak architektura bieżącego komputera (definiowana przez <literal>APT::" +"Architecture</literal>). Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"Host-Architecture</literal>." + +# +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1395,7 +1428,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:385 +#: apt-get.8.xml:396 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 " @@ -1409,7 +1442,7 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1422,7 +1455,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1435,7 +1468,7 @@ msgstr "" "<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1449,7 +1482,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -1466,7 +1499,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1489,7 +1522,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1504,7 +1537,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1513,7 +1546,7 @@ msgstr "" "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:451 +#: apt-get.8.xml:462 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 " @@ -1531,7 +1564,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:461 +#: apt-get.8.xml:472 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 " @@ -1555,7 +1588,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1570,7 +1603,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1580,7 +1613,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1595,7 +1628,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 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 " @@ -1615,7 +1648,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1627,7 +1660,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:524 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1638,7 +1671,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:518 +#: apt-get.8.xml:529 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::" @@ -1649,7 +1682,7 @@ msgstr "" "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1659,15 +1692,15 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "Pliki" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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" @@ -1675,7 +1708,7 @@ msgstr "Zobacz także" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:559 #, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " @@ -1691,7 +1724,7 @@ msgstr "" "&apt-preferences;, APT Howto." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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" @@ -1699,7 +1732,7 @@ msgstr "Diagnostyka" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -3519,7 +3552,16 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3528,14 +3570,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3544,7 +3586,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3559,7 +3601,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3576,7 +3618,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3587,7 +3629,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3600,7 +3642,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3620,38 +3662,38 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3659,7 +3701,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3672,7 +3714,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3684,7 +3726,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3696,7 +3738,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3704,7 +3746,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3715,7 +3757,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3725,21 +3767,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3751,7 +3793,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3763,14 +3805,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3782,14 +3824,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes per second. The default " @@ -3799,7 +3841,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3807,7 +3849,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -3821,7 +3863,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3832,7 +3874,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -3854,7 +3896,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -3873,7 +3915,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -3883,7 +3925,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -3892,7 +3934,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -3902,13 +3944,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -3921,20 +3963,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -3946,19 +3988,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -3976,13 +4018,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -3997,7 +4039,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4005,7 +4047,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4014,7 +4056,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4026,13 +4068,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4054,7 +4096,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4063,22 +4105,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4090,7 +4132,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4103,7 +4145,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4113,7 +4155,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4121,7 +4163,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4132,7 +4174,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4145,7 +4187,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4156,12 +4198,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4169,7 +4211,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4182,40 +4224,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4223,7 +4265,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4232,7 +4274,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4243,7 +4285,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4252,7 +4294,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -4263,7 +4305,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -4274,26 +4316,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4308,7 +4350,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4322,7 +4364,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4336,7 +4378,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4349,7 +4391,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4366,7 +4408,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4377,7 +4419,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4387,7 +4429,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4405,7 +4447,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4419,12 +4461,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4433,13 +4475,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 #, fuzzy msgid "Debug options" msgstr "opcje" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4450,7 +4492,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4458,7 +4500,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4466,7 +4508,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4476,7 +4518,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -4486,59 +4528,59 @@ msgstr "" "in CDROM IDs." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -4546,53 +4588,53 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -4602,7 +4644,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -4620,46 +4662,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -4667,20 +4709,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Przykłady" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -4688,7 +4730,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/pt.po b/doc/po/pt.po index 3927c4534..8804267b9 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -1341,13 +1341,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" "Esta opção controla a arquitectura para que os pacotes são compilados pelo " "<command>apt-get source --compile</command> e como as dependências cruzadas " @@ -1358,6 +1366,30 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 +#, fuzzy +#| msgid "" +#| "This option controls the architecture packages are built for by " +#| "<command>apt-get source --compile</command> and how cross-" +#| "builddependencies are satisfied. By default is it not set which means " +#| "that the host architecture is the same as the build architecture (which " +#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " +#| "<literal>APT::Get::Host-Architecture</literal>" +msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" +"Esta opção controla a arquitectura para que os pacotes são compilados pelo " +"<command>apt-get source --compile</command> e como as dependências cruzadas " +"de compilação são satisfeitas. Por predefinição não está activa o que " +"significa que a arquitectura anfitriã é a mesma que a arquitectura de " +"compilação (a qual é definida por <literal>APT::Architecture</literal>). " +"item de Configuração: <literal>APT::Get::Host-Architecture</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1366,7 +1398,7 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:385 +#: apt-get.8.xml:396 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 " @@ -1379,7 +1411,7 @@ msgstr "" "Item de Configuração: <literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1391,7 +1423,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1404,7 +1436,7 @@ msgstr "" "Configuração: <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1417,7 +1449,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:419 +#: apt-get.8.xml:430 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 " @@ -1432,7 +1464,7 @@ msgstr "" "<literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -1453,7 +1485,7 @@ msgstr "" "Configuração: <literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1466,7 +1498,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:446 +#: apt-get.8.xml:457 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1475,7 +1507,7 @@ msgstr "" "Configuração: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:451 +#: apt-get.8.xml:462 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 " @@ -1492,7 +1524,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:461 +#: apt-get.8.xml:472 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 " @@ -1515,7 +1547,7 @@ msgstr "" "Release</literal>; veja também o manual &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1529,7 +1561,7 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1539,7 +1571,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1552,7 +1584,7 @@ msgstr "" "Configuração: <literal>APT::Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 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 " @@ -1571,7 +1603,7 @@ msgstr "" "<literal>APT::Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1582,7 +1614,7 @@ msgstr "" "Only</literal>, e <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:524 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1591,7 +1623,7 @@ msgstr "" "de Configuração: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:518 +#: apt-get.8.xml:529 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::" @@ -1602,7 +1634,7 @@ msgstr "" "Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1612,22 +1644,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "Ficheiros" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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 "Veja também" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:559 #, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " @@ -1643,14 +1675,14 @@ msgstr "" "&guidesdir;, &apt-preferences;, o Howto do APT." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -3491,7 +3523,16 @@ msgstr "" "<command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3504,7 +3545,7 @@ msgstr "" "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3513,7 +3554,7 @@ msgstr "" "os pacotes segurados sejam ignorados na sua decisão de marcação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3527,7 +3568,7 @@ msgstr "" "directo de os reinstalar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3554,7 +3595,7 @@ msgstr "" "de A não está mais satisfeita." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3583,7 +3624,7 @@ msgstr "" "que pode ajudar a prevenir." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3600,7 +3641,7 @@ msgstr "" "eles possa trabalhar em melhorar ou corrigir o processo de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3621,7 +3662,7 @@ msgstr "" "command> ou nada de que esses pacotes dependam." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3658,13 +3699,13 @@ msgstr "" "da cache é desactivado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Define quais pacotes são considerados dependências essenciais de compilação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3673,7 +3714,7 @@ msgstr "" "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3682,7 +3723,7 @@ msgstr "" "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3691,12 +3732,12 @@ msgstr "" "documentação para mais informação acerca das opções de aqui." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "O Grupo Acquire" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3707,7 +3748,7 @@ msgstr "" "descarga (veja também &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3729,7 +3770,7 @@ msgstr "" "seguinte." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3749,7 +3790,7 @@ msgstr "" "nome da opção." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3769,7 +3810,7 @@ msgstr "" "arquivo ao nome da opção." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3780,7 +3821,7 @@ msgstr "" "por inteiro. Verdadeiro por predefinição." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3798,7 +3839,7 @@ msgstr "" "completo em vez das patches." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3813,7 +3854,7 @@ msgstr "" "aberta uma ligação por tipo de URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3822,7 +3863,7 @@ msgstr "" "tentar, no número fornecido de vezes, obter ficheiros falhados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3832,7 +3873,7 @@ msgstr "" "A predefinição é verdadeiro." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3851,7 +3892,7 @@ msgstr "" "variável de ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3871,7 +3912,7 @@ msgstr "" "(grandes) ficheiros .deb." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3881,7 +3922,7 @@ msgstr "" "dados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3900,7 +3941,7 @@ msgstr "" "web e proxies que escolheram não respeitar a especificação HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3909,7 +3950,7 @@ msgstr "" "os redireccionamentos, o que está activo por predefinição." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 #, fuzzy #| msgid "" #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" @@ -3931,7 +3972,7 @@ msgstr "" "de múltiplos servidores ao mesmo tempo.)" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3943,7 +3984,7 @@ msgstr "" "identificador conhecido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -3957,7 +3998,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3974,7 +4015,7 @@ msgstr "" "literal> ainda não é suportada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -4013,7 +4054,7 @@ msgstr "" "host>::SslForceVersion</literal> é a opção 'por máquina' correspondente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -4047,7 +4088,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -4063,7 +4104,7 @@ msgstr "" "específica (veja a amostra de ficheiro de configuração para exemplos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4077,7 +4118,7 @@ msgstr "" "eficiência." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4092,13 +4133,13 @@ msgstr "" "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4119,7 +4160,7 @@ msgstr "" "barra final. Comandos para desmontar podem ser especificados usando o UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4128,13 +4169,13 @@ msgstr "" "literal>, a qual passa parâmetros adicionais ao gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4153,19 +4194,19 @@ msgstr "" "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4197,13 +4238,13 @@ msgstr "" "automaticamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4229,7 +4270,7 @@ msgstr "" "prefixar a lista com este tipo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4241,7 +4282,7 @@ msgstr "" "maioritariamente apenas para mirrors locais." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4254,7 +4295,7 @@ msgstr "" "CPU quando constrói as caches de pacotes locais. Falso por predefinição." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4274,13 +4315,13 @@ msgstr "" "especialmenteraros." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4319,7 +4360,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4333,22 +4374,22 @@ msgstr "" "literal>\" implícito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "Directórios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4367,7 +4408,7 @@ msgstr "" "items que não começam com <filename>/</filename> ou <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4389,7 +4430,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4404,7 +4445,7 @@ msgstr "" "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4415,7 +4456,7 @@ msgstr "" "estar feito então é carregado o ficheiro de configuração principal." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4433,7 +4474,7 @@ msgstr "" "respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4454,7 +4495,7 @@ msgstr "" "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4472,12 +4513,12 @@ msgstr "" "expressão regular." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "APT em DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4488,7 +4529,7 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4510,7 +4551,7 @@ msgstr "" "pacotes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4519,7 +4560,7 @@ msgstr "" "comandos quando é corrido para a fase de instalação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4528,7 +4569,7 @@ msgstr "" "comandos quando é executado para a fase de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4537,12 +4578,12 @@ msgstr "" "continuar. A predefinição é avisar apenas em caso de erro." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "Como o APT chama o &dpkg;" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4551,7 +4592,7 @@ msgstr "" "&dpkg;. Estas estão na secção <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4562,7 +4603,7 @@ msgstr "" "um argumento único ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4575,7 +4616,7 @@ msgstr "" "bin/sh</filename>, caso algum deles falhe, o APT irá abortar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 #, fuzzy #| msgid "" #| "This is a list of shell commands to run before invoking &dpkg;. Like " @@ -4599,7 +4640,7 @@ msgstr "" "instalar, um por cada linha na entrada standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 #, fuzzy #| msgid "" #| "Version 2 of this protocol dumps more information, including the protocol " @@ -4620,7 +4661,7 @@ msgstr "" "dado ao <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -4631,7 +4672,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -4642,7 +4683,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4651,7 +4692,7 @@ msgstr "" "predefinição é <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4660,12 +4701,12 @@ msgstr "" "predefinição é desactivar a assinatura e produzir todos os binários." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "Utilização trigger do dpkg (e opções relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4691,7 +4732,7 @@ msgstr "" "100% enquanto na realidade está a configurar todos os pacotes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4705,7 +4746,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4729,7 +4770,7 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4751,7 +4792,7 @@ msgstr "" "chamadas unpack e remove." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4781,7 +4822,7 @@ msgstr "" "arrancar." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4799,7 +4840,7 @@ msgstr "" "esta opção em todas excepto na última execução." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4815,7 +4856,7 @@ msgstr "" "configurar este pacote." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4833,7 +4874,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4857,12 +4898,12 @@ msgstr "" "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "Opções Periodic e Archives" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4875,12 +4916,12 @@ msgstr "" "Veja o cabeçalho deste script para uma breve documentação das suas opções." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "Opções de depuração" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4897,7 +4938,7 @@ msgstr "" "interesse para o utilizador normal, mas algumas podem ter:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4908,7 +4949,7 @@ msgstr "" "remove, purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4919,7 +4960,7 @@ msgstr "" "<literal>apt-get -s install</literal>) como um utilizador não root." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4931,7 +4972,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4940,12 +4981,12 @@ msgstr "" "IDs de CD-ROM." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "Segue-se uma lista completa de opções de depuração para o apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -4953,25 +4994,25 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -4980,7 +5021,7 @@ msgstr "" "criptográficas usando <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -4989,13 +5030,13 @@ msgstr "" "armazenados em CD-ROMs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Descreve os processos de resolver dependências de compilação no &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -5004,7 +5045,7 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5015,7 +5056,7 @@ msgstr "" "para um CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -5025,14 +5066,14 @@ msgstr "" "literal></quote> ao mesmo tempo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Regista no log quando os items são adicionados ou removidos da fila de " "download global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -5041,7 +5082,7 @@ msgstr "" "checksums e assinaturas criptográficas dos ficheiros descarregados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -5051,7 +5092,7 @@ msgstr "" "pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -5060,7 +5101,7 @@ msgstr "" "do apt quando se descarrega diffs de índice em vez de índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -5068,7 +5109,7 @@ msgstr "" "downloads." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -5077,7 +5118,7 @@ msgstr "" "de pacotes e com a remoção de pacotes não utilizados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5092,7 +5133,7 @@ msgstr "" "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5123,7 +5164,7 @@ msgstr "" "pacote aparece." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5133,7 +5174,7 @@ msgstr "" "único." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5142,7 +5183,7 @@ msgstr "" "estado e quaisquer erros encontrados enquanto os analisa." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5151,7 +5192,7 @@ msgstr "" "literal> deve passar os pacotes ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -5159,12 +5200,12 @@ msgstr "" "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "Escreve a prioridade da cada lista de pacote no arranque." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5173,7 +5214,7 @@ msgstr "" "acontece quando é encontrado um problema de dependências complexo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5184,7 +5225,7 @@ msgstr "" "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5193,13 +5234,13 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5209,7 +5250,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 5ba917dd4..4851a9699 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-28 08:46+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -925,18 +925,28 @@ msgid "" "satisfied. By default is it not set which means that the host architecture " "is the same as the build architecture (which is defined by <literal>APT::" "Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" -"Architecture</literal>" +"Architecture</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 msgid "" +"This option controls the activated build profiles for which a source package " +"is built by <command>apt-get source --compile</command> and how build " +"dependencies are satisfied. By default no build profile is active. More " +"than one build profile can be activated at a time by concatenating them with " +"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:391 +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:385 +#: apt-get.8.xml:396 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 " @@ -945,7 +955,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:392 +#: apt-get.8.xml:403 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -957,7 +967,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:404 +#: apt-get.8.xml:415 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -966,7 +976,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:411 +#: apt-get.8.xml:422 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -975,7 +985,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:419 +#: apt-get.8.xml:430 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 " @@ -985,7 +995,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:427 +#: apt-get.8.xml:438 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 " @@ -998,7 +1008,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:449 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. " @@ -1007,14 +1017,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:446 +#: apt-get.8.xml:457 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:451 +#: apt-get.8.xml:462 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 " @@ -1025,7 +1035,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:461 +#: apt-get.8.xml:472 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 " @@ -1039,7 +1049,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:476 +#: apt-get.8.xml:487 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1048,14 +1058,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:494 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:489 +#: apt-get.8.xml:500 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1064,7 +1074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:507 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 " @@ -1076,7 +1086,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:518 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</" @@ -1084,14 +1094,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:524 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:518 +#: apt-get.8.xml:529 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::" @@ -1099,7 +1109,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:524 +#: apt-get.8.xml:535 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1109,15 +1119,15 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: 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 +#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt.conf.5.xml:1209 apt_preferences.5.xml:700 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:558 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.conf.5.xml:1215 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 #, fuzzy @@ -1125,7 +1135,7 @@ msgid "See Also" msgstr "Consulte também" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:559 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " @@ -1133,14 +1143,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:564 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:554 +#: apt-get.8.xml:565 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -2471,7 +2481,16 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:182 +msgid "" +"List of all build profiles enabled for build-dependency resolution, without " +"the \"<literal>profile.</literal>\" namespace prefix. By default this list " +"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" +"buildpackage; overrides the list notation." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -2480,14 +2499,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:187 +#: apt.conf.5.xml:196 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:201 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -2496,7 +2515,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:209 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -2511,7 +2530,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:212 +#: apt.conf.5.xml:221 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -2528,7 +2547,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:234 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -2539,7 +2558,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:245 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -2552,7 +2571,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:257 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -2572,38 +2591,38 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 +#: apt.conf.5.xml:273 msgid "Defines which packages are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:268 +#: apt.conf.5.xml:277 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:282 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:278 +#: apt.conf.5.xml:287 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:293 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:294 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -2611,7 +2630,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:292 +#: apt.conf.5.xml:301 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -2624,7 +2643,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:314 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -2636,7 +2655,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:326 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -2648,7 +2667,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:338 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -2656,7 +2675,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:332 +#: apt.conf.5.xml:341 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -2667,7 +2686,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:342 +#: apt.conf.5.xml:351 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -2677,21 +2696,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:359 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:364 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:369 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -2703,7 +2722,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:377 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -2715,14 +2734,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:378 apt.conf.5.xml:466 +#: apt.conf.5.xml:387 apt.conf.5.xml:475 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:390 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -2734,14 +2753,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:397 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:391 +#: apt.conf.5.xml:400 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes per second. The default " @@ -2751,7 +2770,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:398 +#: apt.conf.5.xml:407 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -2759,7 +2778,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:411 msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. Apt expects the " @@ -2773,7 +2792,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:429 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -2784,7 +2803,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:437 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -2806,7 +2825,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:458 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -2825,7 +2844,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:478 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -2835,7 +2854,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:485 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -2844,7 +2863,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:490 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -2854,13 +2873,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:504 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:499 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -2873,20 +2892,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:523 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:518 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -2898,19 +2917,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:531 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:524 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -2928,13 +2947,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:538 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:533 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -2949,7 +2968,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:543 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -2957,7 +2976,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:550 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -2966,7 +2985,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:558 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -2978,13 +2997,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:575 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:563 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -3006,7 +3025,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:576 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -3015,22 +3034,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:598 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:600 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -3042,7 +3061,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:607 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -3055,7 +3074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:616 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -3065,7 +3084,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:622 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -3073,7 +3092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -3084,7 +3103,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -3097,7 +3116,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:647 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -3108,12 +3127,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:656 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:658 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -3121,7 +3140,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -3134,40 +3153,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:677 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:682 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:687 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "How APT calls &dpkg;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:694 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:699 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -3175,7 +3194,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:705 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -3184,7 +3203,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:712 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -3195,7 +3214,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:719 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -3204,7 +3223,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:724 msgid "" "The version of the protocol to be used for the command " "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting " @@ -3215,7 +3234,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "" "The file descriptor to be used to send the information can be requested with " "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</" @@ -3226,26 +3245,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:732 +#: apt.conf.5.xml:741 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:746 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:751 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:743 +#: apt.conf.5.xml:752 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -3260,7 +3279,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:767 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -3270,7 +3289,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:752 +#: apt.conf.5.xml:761 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -3284,7 +3303,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:774 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -3297,7 +3316,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -3314,7 +3333,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:797 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -3325,7 +3344,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:804 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -3335,7 +3354,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:817 #, no-wrap msgid "" "OrderList::Score {\n" @@ -3347,7 +3366,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:810 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -3361,12 +3380,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:830 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:831 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -3375,12 +3394,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:839 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:841 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -3391,7 +3410,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:852 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -3399,7 +3418,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -3407,7 +3426,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:869 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -3417,66 +3436,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:877 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:887 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:896 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:907 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:918 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:929 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:940 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:951 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:961 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:971 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:972 +#: apt.conf.5.xml:981 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -3484,53 +3503,53 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:992 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1014 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1015 +#: apt.conf.5.xml:1024 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1036 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1047 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1049 +#: apt.conf.5.xml:1058 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1059 +#: apt.conf.5.xml:1068 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -3540,7 +3559,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1082 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -3558,46 +3577,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1094 +#: apt.conf.5.xml:1103 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1105 +#: apt.conf.5.xml:1114 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1116 +#: apt.conf.5.xml:1125 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1137 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1139 +#: apt.conf.5.xml:1148 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1149 +#: apt.conf.5.xml:1158 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1160 +#: apt.conf.5.xml:1169 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -3605,21 +3624,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1172 +#: apt.conf.5.xml:1181 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 +#: apt.conf.5.xml:1203 apt_preferences.5.xml:547 sources.list.5.xml:239 #: apt-ftparchive.1.xml:598 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1195 +#: apt.conf.5.xml:1204 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -3627,7 +3646,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1207 +#: apt.conf.5.xml:1216 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/po/ar.po b/po/ar.po index 123e762a7..1f8759b0d 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,157 +19,157 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: KBabel 1.11.4\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "أسماء الحزم الكلية :" -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "أسماء الحزم الكلية :" -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " الحزم العادية:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr "الحزمة الوهمية تماماً:" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " الحزمة الوهمية المفردة:" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " الحزم الوهمية المختلطة:" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " مفقودة:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "مجموع النسخ الفريدة:" -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "مجموع النسخ الفريدة:" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "مجموع المعتمدات:" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "مجموع علاقات النسخ/الملفات:" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "مجموع علاقات النسخ/الملفات:" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "مجموع علاقات النسخ/الملفات:" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "مجموع المساحة المحسوب حسابها:" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "لم يُعثر على أية حزم" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "يجب أن تعطي صيغة واحدة بالضبط" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "ملفات الحزم:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "الحزم المُدبّسة:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(غير موجود)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " مُثبّت:" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " مرشّح: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(لاشيء)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " جدول النسخ:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -206,29 +206,29 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "فشل تغيير اسم %s إلى %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." @@ -252,65 +252,65 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" @@ -330,151 +330,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -520,7 +520,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" @@ -529,7 +529,7 @@ msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصد msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -542,53 +542,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "إلا أنها غير مثبتة" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "فشل فتح %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -615,7 +615,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -663,52 +663,52 @@ msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون ل msgid "Disk not found." msgstr "لم يُعثر على القرص." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "لم يُعثر على الملف" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "تسجيل الدخول" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "رفض الخادم اتصالنا بالرد: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "فشل USER، ردّ الخادم: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "فشل PASS، ردّ الخادم: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -716,121 +716,123 @@ msgstr "" "تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin " "فارغ." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "فشل TYPE، ردّ الخادم: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "انتهى وقت الاتصال" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "خطأ في القراءة" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "خطأ في الكتابة" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "فشل" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "تعذر إرسال الأمر PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "فشل EPRT، ردّ الخادم: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "فشل نقل البيانات، ردّ الخادم '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "استعلام" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "" @@ -866,7 +868,7 @@ msgstr "تعذر الاتصال بـ%s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "الاتصال بـ%s" @@ -896,181 +898,181 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "بانتظار الترويسات" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "سطر ترويسة سيء" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "أرسل خادم http ترويسة ردّ غير صالحة" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "خادم http له دعم مدى معطوب" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "خطأ داخلي" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "يا للغرابة... لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "نعم، افعل ما أقوله!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1081,19 +1083,19 @@ msgstr "" "كي تستمر اكتب العبارة '%s'\n" " ؟] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "إجهاض." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "هل تريد الاستمرار؟" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1101,19 +1103,19 @@ msgstr "" "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" "fix-missing؟" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "تعذر تصحيح الحزم المفقودة." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "إجهاض التثبيت." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1123,15 +1125,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1147,16 +1149,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1166,7 +1168,7 @@ msgid_plural "" msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:" msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1174,24 +1176,24 @@ msgid_plural "" msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:" msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1199,145 +1201,145 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "حزم معطوبة" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "تم غض النظر عن تحذير المصادقة.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "تعذرت المصادقة على بعض الحزم" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "تثبيت هذه الحزم دون التحقق منها؟" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " أو" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1345,27 +1347,27 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" @@ -1374,7 +1376,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[Y/n]" @@ -1382,91 +1384,91 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "تصحيح المعتمدات..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " فشل." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "لم يمكن تصحيح المعتمدات" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "لم يمكن تقليص مجموعة الترقية" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " تم" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "تمّ" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1474,43 +1476,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "فشل تغيير اسم %s إلى %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "" -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "جلب:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "تجاهل" -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "خطأ" -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "جلب %sب في %s (%sب/ث)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [يعمل]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1523,19 +1525,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "تعذرت قراءة %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "" @@ -1564,11 +1566,11 @@ msgstr "فشل إغلاق الملف %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "" @@ -1608,7 +1610,7 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها msgid "Merging available information" msgstr "دمج المعلومات المتوفرة" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1622,40 +1624,40 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "قائمة توسيعات الحزمة طويلة جداً" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "خطأ في معالجة الدليل %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "قائمة توسيعات المصدر طويلة جداً" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "خطأ في معالجة المحتويات %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1697,217 +1699,217 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "لم تُطابق أية تحديدات" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: تعذرت قراءة الدليل %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "فشل فتح %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** فشل ربط %s بـ%s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - فشل تعيين الذاكرة" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "تعذر فتح %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, c-format msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "خطأ داخلي، تعذر إنشاء %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -1939,157 +1941,157 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "فشل تنفيذ gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "أرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "توقيع الأرشيف غير صالح" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "توقيع الأرشيف غير صالح" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "الأرشيف قصير جداً" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "فشلت قراءة ترويسات الأرشيف" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "خطأ داخلي في AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "فشلت كتابة الملف %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "المسار %s طويل جداً" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "فكّ تحزيم %s أكثر من مرّة" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "المسار طويل جداً" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "خطأ داخلي، تعذر العثور على العضو %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "" @@ -2147,494 +2149,499 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "تعذر العثور على التحديد %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "اختصار نوع مجهول: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "فتح ملف التهيئة %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... خطأ!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... تمّ" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... تمّ" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "خيار سطر الأمر '%c' [من %s] مجهول." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "خيار سطر الأمر %s غير مفهوم" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "الخيار %s يتطلّب مُعطى." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "الخيار '%s' طويل جداً" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "مشكلة في إغلاق الملف" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "مشكلة في إغلاق الملف" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "فشل إعادة التسمية ، %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "إجهاض التثبيت." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "يعتمد" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "يعتمد مسبقاً" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "يستحسن" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "يقترح" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "يعارض" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "يستبدل" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "يُلغي" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "مهم" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "مطلوب" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "قياسي" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "اختياري" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "إضافي" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "دمج المعلومات المتوفرة" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "فشل فتح %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "فشلت كتابة الملف %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "فشل إغلاق الملف %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2642,231 +2649,226 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "تعذر قفل دليل القائمة" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, c-format msgid "Is the package %s installed?" msgstr "" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "نظام الحزم '%s' غير مدعوم" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "تعذرت قراءة قائمة المصادر." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "قراءة قوائم الحزم" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "فشل إعادة التسمية ، %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "الحجم غير متطابق" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2874,112 +2876,112 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "فك تركيب القرص المدمج...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "بانتظار القرص...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "تركيب القرص...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "جاري التعرف..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "فك تركيب القرص المدمج...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -2988,34 +2990,34 @@ msgstr "" "هذا القرص مسمى: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "نسخ قوائم الحزم..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "كتابة لائحة المصادر الجديدة\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3030,254 +3032,254 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "تهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "تحضير %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "فتح %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "التحضير لتهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "التحضير لإزالة %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "تم إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "تعذرت الكتابة إلى %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "تعذر قفل دليل القائمة" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/ast.po b/po/ast.po index 7e9f8b827..977985205 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -15,154 +15,154 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Virtaal 0.5.2\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquete %s versión %s nun cumple una dependencia:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Total de nomes de paquetes: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Total de cadarmes de paquetes: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Paquetes normales: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Paquetes virtuales puros: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Paquetes virtuales cenciellos: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Paquetes virtuales amestaos: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Falten: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Versiones distintes en total: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Descripciones distintes en total: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Dependencies totales: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Rellaciones versión/ficheru en total: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Rellaciones descripción/ficheru en total: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Mapes de provisiones en total: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Cadenes globalizaes en total: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Espaciu de dependencies de versión en total: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Espaciu ociosu en total: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Informe del total d'espaciu: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "El ficheru de paquetes %s nun ta sincronizáu." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Nun s'alcontraron paquetes" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Has de dar polo menos un patrón de gueta" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Nun pue alcontrase'l paquete %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Ficheros de paquete:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "La caché nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Paquetes na chincheta:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nun s'alcontró)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instaláu: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidatu: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(dengún)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Chincheta de paquetes: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabla de versiones:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compiláu en %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -238,28 +238,28 @@ msgstr "" "tmp\n" "Ver les páxines del manual apt-cache(8) y apt.conf(5) pa más información.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Inxerta un discu nel preséu y calca intro" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falló al montar '%s' a '%s'" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repite'l procesu colos demás CDs del conxuntu." @@ -295,65 +295,65 @@ msgstr "" " -c=? Llee esti ficheru de configuración\n" " -o=? Conseña una opción de configuración arbitraria, p. ex.\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Inorar versión non disponible de '%s' del paquete '%s'" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustáu como instaláu manualmente.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s axustáu como instaláu automáticamente.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes frañó coses" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" @@ -379,97 +379,97 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseñar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +478,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +487,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye " "enforma nuevu" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +503,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,30 +512,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -626,7 +626,7 @@ msgstr "" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" @@ -635,7 +635,7 @@ msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -648,53 +648,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "pero nun ta instaláu" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s axustáu como instaláu manualmente.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s axustáu como instaláu automáticamente.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s yá ta na versión más nueva.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s yá ta na versión más nueva.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ellí" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s axustáu como instaláu manualmente.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Nun pudo abrise %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -721,7 +721,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -769,52 +769,52 @@ msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando entá." msgid "Disk not found." msgstr "Nun s'atopa'l discu." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Nun s'atopa'l ficheru." -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI malu, los URIS llocales nun pueden entamar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Entrando" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Nun se pudo determinar el nome del par" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Nun se pudo determinar el nome llocal" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "El sirvidor refugó la conexón, y dixo: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "L'usuariu (USER) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "La contraseña (PASS) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -822,121 +822,123 @@ msgstr "" "Especificóse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::" "ProxyLogin ta baleru." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "La triba (TYPE) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Gandió'l tiempu de conexón" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "El sirvidor zarró la conexón" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Fallu de llectura" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Una rempuesta revirtió'l buffer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Corrupción del protocolu" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Fallu d'escritura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Nun se pudo crear un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Falló" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Nun se pudo coneutar un socket pasivu." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nun pudo obtener un zócalu oyente" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Nun se pudo enllazar con un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Nun se pudo escuchar nel socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Nun se pudo determinar el nome del socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Nun se pudo mandar la orde PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Direición de familia %u desconocida (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló; el sirvidor dixo: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Gandió'l tiempu de conexón col zócalu de datos" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexón" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Gandió'l tiempu del zócalu de datos" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Falló la tresferencia de datos; el sirvidor dixo '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Nun se pudo invocar " @@ -972,7 +974,7 @@ msgstr "Nun se pudo coneutar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Coneutando a %s" @@ -1002,37 +1004,37 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nun pudo coneutase a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Atopóse polo menos una robla mala." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Fallu desconocíu al executar gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1040,146 +1042,147 @@ msgstr "" "Les robles siguientes nun pudieron verificase porque la to llave pública nun " "ta a mano:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Esperando les testeres" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Fallu na llinia testera" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "El sirvidor HTTP mandó una testera incorreuta de rempuesta" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Length" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Range" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Formatu de data desconocíu" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Fallo la conexón" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Fallu internu" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun finó" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "Que raro... Los tamaños nun concasen, escribe a apt@packages.debian.org" +msgstr "" +"Que raro... Los tamaños nun concasen, escribe a apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que descargar %sB/%sB d'archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que descargar %sB d'archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Nun tienes espaciu libre bastante en %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Hai problemes y utilizose -y ensin --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Sí, ¡facer lo que digo!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1190,19 +1193,19 @@ msgstr "" "Pa continuar escribe la frase '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Encaboxar." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "¿Quies continuar?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1210,19 +1213,19 @@ msgstr "" "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o " "tentando --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Nun pudieron iguase los paquetes que falten." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Encaboxando la instalación." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1236,15 +1239,15 @@ msgstr[1] "" "Los siguientes paquetes desaparecieron del sistema como\n" "tolos ficheros fueron sobroescritos por otros paquetes:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1262,15 +1265,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información pue aidar a resolver la situación:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompió coses" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1281,7 +1284,7 @@ msgstr[1] "" "Los siguientes paquetes instaláronse de manera automática y ya nun se " "necesiten:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1290,18 +1293,18 @@ msgstr[0] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n msgstr[1] "" "Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos." msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1309,7 +1312,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "conseña una solución)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1321,145 +1324,145 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Paquetes frañaos" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Instalaránse los siguientes paquetes extra:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Avisu d'autenticación saltáu.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Dellos paquetes nun pudieron autenticase" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "¿Instalar esos paquetes ensin verificación?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " o" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1467,27 +1470,27 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" @@ -1496,7 +1499,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[S/n]" @@ -1504,91 +1507,91 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Iguando dependencies..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " falló." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Nun pudieron iguase les dependencies" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Nun pue amenorgase'l conxuntu d'actualización" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Fecho" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Habríes d'executar 'apt-get -f install' para igualo." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dependencies incumplíes. Téntalo usando -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Calculando l'anovamientu... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Error internu, AllUpgrade rompió coses" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Fecho" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1601,43 +1604,43 @@ msgstr "" " asina que nun dependen de la pertinencia de la verdadera situación " "actual!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nun pudo renomase %s como %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Oxe " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Des:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Descargaos %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Tresnando]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1650,19 +1653,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Nun ye a lleer %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nun se pudo cambiar a %s" @@ -1691,11 +1694,11 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Conexón encaboxada prematuramente" @@ -1738,7 +1741,7 @@ msgstr "" msgid "Merging available information" msgstr "Fusionando información disponible" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1763,40 +1766,40 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Nun se pue escribir en %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "La llista d'estensión de paquetes ye enforma llarga" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Error al procesar el direutoriu %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "La llista d'estensión de fontes ye enforma llarga" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Error al escribir la cabecera al ficheru de conteníos" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Error al procesar conteníos %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1877,26 +1880,26 @@ msgstr "" " -c=? Lleer esti ficheru de configuración\n" " -o=? Afita una escoyeta de configuración propia" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nun concasó denguna seleición" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "La BD corrompiose, ficheru renomáu como %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La DB ye antigua, tentando actualizar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1904,192 +1907,192 @@ msgstr "" "El formatu de la base de datos nun ye válidu. Si anovaste dende una versión " "anterior d'apt, desanicia y recrea la base de datos." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nun pudo abrise'l ficheru de BD %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Nun pudo lleese %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "L'archivu nun tien rexistru de control" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Nun pudo algamase un cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Nun pudo lleese'l direutoriu %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Nun pudo lleese %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Errores aplicables al ficheru " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Nun pudo resolvese %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Falló'l percorríu pol árbol" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Nun pudo abrise %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Desenllazar %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Nun pudo lleese l'enllaz %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Nun pudo desenllazase %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falló enllazar enllazr %s a %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzose'l llímite of %sB de desenllaz.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "L'archivu nun tien el campu paquetes" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s nun tien la entrada saltos\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el curiador de %s ye %s y non %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s nun tien la entrada saltos de fonte\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nun pudo allugase memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nun pudo abrise %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Saltu mal formáu %s llinia %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nun pudo lleese'l ficheru de saltos %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Saltu mal formáu %s llinia %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Saltu mal formáu %s llinia %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Saltu mal formáu %s llinia %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmu de compresión desconocíu '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La salida comprimida %s necesita un xuegu de compresión" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Nun pudo criase FICHERU*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Nun pudo biforcase" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Comprimir fíu" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Error internu, nun pudo criase %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Fallu na ES al soprocesu/ficheru" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Nun pudo lleese al computar MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problema al desenllazar %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2144,157 +2147,157 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n" "cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Fallu al crear les tuberíes" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Fallu al executar gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Ficheru tollíu" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Falló la suma de control de tar, ficheru tollíu" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Testera del TAR triba %u desconocida, miembru %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Robla del ficheru inválida" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Fallu al lleer la testera de miembru del ficheru" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Testera de miembru del archivu %s inválida" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Testera de miembru del ficheru inválida" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "El ficheru ye perpequeñu" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Falló al lleer les testeres del ficheru" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "¡Fallu al atopar l'elementu enllazáu!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Falló al allugar una desvíu" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Fallu internu en AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doble suma de desvíu %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Ficheru de configuración duplicáu %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura nel ficheru %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falló al pesllar el ficheru %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "La trayeutoria %s ye enforma llarga" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s más d'una vegada" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "El direutorio %s ta desviáu" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "La trayeutoria de desviación ye enforma llarga" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El direutoriu %s ta reemplazándose por un non-direutoriu" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Fallu al atopar el nodu nel so bote d'enllaz" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "La trayeutoria ye perllarga" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Nun ye a lleer %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error internu, nun se pue atopar el miembru %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Ficheru de control inanalizable" @@ -2354,488 +2357,493 @@ msgstr "" "desactivao pol usuariu." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Escoyeta %s que nun s'atopa" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Triba d'abreviatura que nun se reconoz: «%c»" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo ficheros de configuración %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Fallu de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Les directives pueden facese sólo nel nivel cimeru" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones añeraes" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Fallu de sintaxis %s:%u: Directiva llimpia requier un tres opciones como " "argumentos" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ¡Fallu!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fecho" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Fecho" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "La opción de llinia d'ordes '%c' [de %s] ye desconocida." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Nun s'entiende la opción %s de la llinia d'ordes" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "La opción %s de la llinia d'ordes nun ye un valor booleanu" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "La opción %s necesita un argumentu." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opción %s: L'axuste del elementu de configuración ha tener un =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "La opción %s pide un argumentu enteru, non '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opción '%s' enforma llarga" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "El sentíu %s nun s'entiende, prueba con braeru o falsu." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operación incorreuta: %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nun puede algamase información del puntu de montaxe %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Nun se pudo montar el CD-ROM" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problemes zarrando'l ficheru gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu de sólo llectura %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Nun puede abrise'l ficheru de bloquéu %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu %s montáu per nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Nun se pudo torgar %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subprocesu %s recibió un fallu de segmentación." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "El subprocesu %s recibió una señal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subprocesu %s devolvió un códigu d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subprocesu %s terminó de manera inesperada" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problemes zarrando'l ficheru gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nun se pudo abrir el ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Nun pudo abrise un ficheru descriptor %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Nun pudo criase'l soprocesu IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Nun pudo executase'l compresor " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "falló'l cambiu de nome, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "L'aniellu de claves nun s'instaló en %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Caché de paquetes balera." -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "El ficheru de caché de paquetes ta tollíu" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "El ficheru de caché de paquetes ye una versión incompatible" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "El ficheru de caché de paquetes ta tollíu" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Esti APT nun soporta'l sistema de versiones '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "La caché de paquetes creóse pa una arquitectura estremada" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Depende de" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Predepende de" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Suxer" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "En conflictu con" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Sustituye a" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Fai obsoletu a" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Ruempe" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Aumenta" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "requeríu" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Creando árbol de dependencies" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versiones candidates" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Xeneración de dependencies" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Lleendo información d'estáu" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Nun se pudo abrir el ficheru d'estáu %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Falló la escritura del ficheru temporal d'estáu %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinia %u enforma llarga na llista d'oríxenes %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2844,12 +2852,12 @@ msgstr "" "Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man " "5 apt.conf embaxo APT::Immediate-Configure for details. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2860,19 +2868,19 @@ msgstr "" "esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye " "malo, pero si daveres quies facelo, activa la opción APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2880,216 +2888,211 @@ msgstr "" "Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola " "mor de paquetes reteníos." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Falta'l direutoriu de llistes %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Falta'l direutoriu d'archivos %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Nun pudo bloquiase'l direutoriu %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Descargando ficheru %li de %li (falten %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Descargando ficheru %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "El métodu %s nun entamó correchamente" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Nun pudo lleese %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'estáu." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Has d'executar apt-get update pa iguar estos problemes" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Nun pudo lleese la llista de fontes." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Rexistru inválidu nel ficheru de preferencies %s, nun hai cabecera Paquete" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Nun s'entiende'l tipu de pin %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Nun hai prioridá (o ye cero) conseñada pa pin" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "La caché tien un sistema de versiones incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Hebo un error al procesar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaya, perpasaste'l númberu de versiones coles que puede esti APT." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Al procesar dependencies de ficheros nun s'alcontró el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Lleendo llista de paquetes" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Recoyendo ficheros qu'apurren" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Fallu de E/S al grabar caché d'oríxenes" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "falló'l cambiu de nome, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "La suma hash nun concasa" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "El tamañu nun concasa" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operación incorreuta: %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3099,12 +3102,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3113,12 +3116,12 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3126,67 +3129,67 @@ msgstr "" "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Ensin seiciones nel ficheru release %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Ensin entrada Hash nel ficheru release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Entrada inválida pa 'Date' nel ficheru release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "El bloque de fornidor %s nun contién una buelga dixital" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el puntu de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando'l CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Esperando'l discu...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montando'l CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificando... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Etiqueta guardada: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando'l CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Buscando nel discu ficheros d'índices...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3195,7 +3198,7 @@ msgstr "" "Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y " "%zu firmes\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3203,16 +3206,16 @@ msgstr "" "Nun s'alcuentra dengún paquete de ficheros, seique nun ye un Discu Debian o " "hai una arquiteutura inválida?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Atopóse la etiqueta: '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Esi nun ye un nome válidu; inténtalo otra vuelta.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3221,34 +3224,34 @@ msgstr "" "Esti discu llámase: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Copiando les llistes de paquetes..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Escribiendo llista nueva d'oríxenes\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i rexistros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rexistros escritos con %i ficheros de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3265,38 +3268,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nun s'alcontró la distribución '%s' pa '%s'" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nun s'alcontró la versión '%s' pa '%s'" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Nun pudo alcontrase la xera '%s'" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3305,56 +3308,56 @@ msgstr "" "Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' " "como non tien nengún d'ellos" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Executando dpkt" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3363,118 +3366,118 @@ msgstr "" "Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los " "antiguos nel so llugar." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Desinstalando %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Desinstalóse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Anotando desaniciáu de %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Executando activador de post-instalación de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Falta'l direutoriu '%s'." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose pa configurar %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s instaláu" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose pa desinstalar %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s desinstaláu" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose pa desinstalar dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Desinstalóse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nun se pue escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependencies - déxase ensin configurar" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3482,7 +3485,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que " "siguió dende un fallu previu" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3490,7 +3493,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3498,7 +3501,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "memoria" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3507,14 +3510,14 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu E/S " "dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3523,14 +3526,14 @@ msgstr "" "Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu " "usándolu?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3538,7 +3541,7 @@ msgstr "" "dpkg interrumpióse, tienes qu'executar manualmente '%s' pa iguar el " "problema. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Non bloquiáu" diff --git a/po/bg.po b/po/bg.po index 7c30864e8..2f1318a55 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -21,154 +21,154 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Generator: KBabel 1.11.4\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакетът %s версия %s има неудовлетворена зависимост:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Общо имена на пакети : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Общо пакетни структури: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Нормални пакети: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Чисти виртуални пакети: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Единични виртуални пакети: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Смесени виртуални пакети: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Липсващи: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Общо уникални версии: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Общо уникални описания: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Общо зависимости: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Общо отношения версия/файл: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Общо отношения описание/файл: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Общо отношения „Осигурява“: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Общо разгърнати низове: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Общо пространство за зависимости по версии: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Общо празно пространство: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Общо отчетено пространство: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Пакетният файл %s не е синхронизиран." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Няма намерени пакети" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Трябва да въведете поне един шаблон за търсене" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Пакетни файлове:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Отбити пакети:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(не са намерени)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Инсталирана: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(няма)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Отбиване на пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -239,28 +239,28 @@ msgstr "" "cache=/tmp\n" "За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Укажете име за този диск, например „Debian 5.0.3 Disk1“" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Сложете диск в устройството и натиснете „Enter“" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Неуспех при монтиране на %s на %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторете този процес за останалите дискове от комплекта." @@ -297,47 +297,47 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Използване на пакет източник „%s“ вместо „%s“\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s е отбелязан като автоматично инсталиран.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -345,19 +345,19 @@ msgstr "" "Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark " "manual“." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" @@ -384,80 +384,80 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,18 +466,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +486,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +495,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +511,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -633,7 +633,7 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" @@ -642,7 +642,7 @@ msgstr "Трябва да укажете поне един пакет за из msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -655,53 +655,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "Пакетът „%s“ не може да бъде маркиран, защото не е инсталиран.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "Пакетът „%s“ вече е отбелязан като ръчно инсталиран.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "Пакетът „%s“ вече е отбелязан като автоматично инсталиран.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "Пакетът „%s“ вече е задуржан.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "Пакетът „%s“ вече е задържан.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "Пакетът „%s“ е задържан.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Отмяна на задържането на пакета „%s“.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -748,7 +748,7 @@ msgstr "" " -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n" "За повече информация прегледайте ръководствата apt-mark(8) и apt.conf(5)." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -796,52 +796,52 @@ msgstr "Неуспех при демонтирането на CD-ROM в %s, мо msgid "Disk not found." msgstr "Дискът не е намерен." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Файлът не е намерен" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Влизане" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Неуспех при установяването на името на отдалечения сървър" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Неуспех при установяването на локалното име" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сървърът отказа свързване и съобщи: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER се провали, сървърът съобщи: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS се провали, сървърът съобщи: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -849,123 +849,125 @@ msgstr "" "Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::" "ProxyLogin е празен." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE се провали, сървърът съобщи: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Допустимото време за свързването изтече" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Грешка при четене" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Отговорът препълни буфера." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Грешка при запис" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Неуспех при създаването на гнездо" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Неуспех при свързването на гнездо за данни, допустимото време за свързване " "изтече" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Неуспех" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Неуспех при свързването на пасивно гнездо." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo не успя да се добере до слушащо гнездо" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Неуспех при свързването на гнездо" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Неуспех при слушането на гнездото" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Неуспех при определянето на името на гнездото" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Неуспех при изпращането на командата PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестно семейство адреси %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT се провали, сървърът съобщи: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Времето за установяване на връзка с гнездо за данни изтече" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Времето за връзка с гнездо за данни изтече" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Запитване" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Неуспех при извикването на " @@ -1001,7 +1003,7 @@ msgstr "Неуспех при свързване с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" @@ -1031,40 +1033,40 @@ msgstr "Нещо лошо се случи при намирането на IP а msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързване с %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1072,116 +1074,116 @@ msgstr "" "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " "наличен:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Празни файлове не могат да бъдат валидни архиви" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Чакане на заглавни части" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Невалиден ред на заглавна част" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Вътрешна грешка" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Странно... Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1190,31 +1192,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Указано е „Trivial Only“, но това не е тривиална операция." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Да, прави каквото казвам!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1225,19 +1227,19 @@ msgstr "" "За да продължите, въведете фразата „%s“\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Прекъсване." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Искате ли да продължите?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1245,19 +1247,19 @@ msgstr "" "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " "или да опитате с „--fix-missing“?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Неуспех при коригирането на липсващите пакети." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Прекъсване на инсталирането." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1271,15 +1273,15 @@ msgstr[1] "" "Следните пакети са отстранени от системата поради препокриване на всичките " "им файлове от други пакети:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Това се прави автоматично от dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1297,16 +1299,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1316,7 +1318,7 @@ msgstr[0] "Следният пакет е бил инсталиран автом msgstr[1] "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1325,17 +1327,17 @@ msgstr[0] "%lu пакет е бил инсталиран автоматично msgstr[1] "" "%lu пакета са били инсталирани автоматично и вече не са необходими:\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете." msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1343,7 +1345,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1355,145 +1357,145 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Счупени пакети" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Някои пакети не можаха да бъдат удостоверени" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Инсталиране на тези пакети без проверка?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " или" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1501,27 +1503,27 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" @@ -1530,7 +1532,7 @@ msgstr "%lu не са напълно инсталирани или премах #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[Y/n]" @@ -1538,93 +1540,93 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Коригиране на зависимостите..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " пропадна." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Неуспех при коригирането на зависимостите" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Неуспех при минимизирането на набора актуализации" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Готово" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Възможно е да изпълните „apt-get -f install“, за да коригирате тези " "неизправности." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворени зависимости. Опитайте с „-f“." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Готово" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1636,43 +1638,43 @@ msgstr "" " Заключването е деактивирано, така че не разчитайте\n" " на повтаряемост в реална ситуация." -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Неуспех при преименуването на %s на %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Поп " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Изт:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Игн " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Грш " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Изтеглени %sB за %s (%sB/сек)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [В процес на работа]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1685,19 +1687,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Неуспех при преминаването в %s" @@ -1726,11 +1728,11 @@ msgstr "Грешка при четене файла „%s“ от огледал msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" @@ -1770,7 +1772,7 @@ msgstr "" msgid "Merging available information" msgstr "Смесване на наличната информация" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1796,40 +1798,40 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Списъкът с разширения на пакети и твърде дълъг" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Грешка при обработката на директория %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Списъкът с разширения на източници е твърде дълъг" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Грешка при запазването на заглавната част във файла със съдържание" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Грешка при обработката на съдържание %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1914,26 +1916,26 @@ msgstr "" " -c=? Четене на този конфигурационен файл.\n" " -o=? Настройване на произволна конфигурационна опция" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Няма съвпадения на избора" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Липсват някои файлове от групата с файлови пакети „%s“" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД е повредена, файлът е преименуван на %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, опит за актуализиране на %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1941,192 +1943,192 @@ msgstr "" "Невалиден формат на БД. Ако сте обновили от по-стара версия на apt, " "премахнете базата от данни и я създайте наново." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Неуспех при отварянето на файл %s от БД: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "В архива няма поле „control“" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Неуспех при получаването на курсор" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Неуспех при четенето на директория %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Неуспех при четенето на %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Грешките се отнасят за файла " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Неуспех при превръщането на %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Неуспех при обхода на дървото" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Неуспех при прочитането на връзка %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Неуспех при премахването на връзка %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Неуспех при създаването на връзка %s към %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Неуспех при заделянето на памет" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Неуспех при отварянето на %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Неправилно форматиран override %s, ред %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Неуспех при четенето на override файл %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Неправилно форматиран override %s, ред %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Неправилно форматиран override %s, ред %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Неправилно форматиран override %s, ред %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Непознат алгоритъм за компресия „%s“" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Компресираният изход %s изисква настройка за компресирането" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Неуспех при създаването на FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Неуспех при пускането на подпроцес" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Процес-потомък за компресиране" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Вътрешна грешка, неуспех при създаването на %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "В/И към подпроцеса/файла пропадна" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Неуспех при четене докато се изчислява MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2179,157 +2181,157 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Неуспех при създаването на програмни канали" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Неуспех при изпълнението на gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Развален архив" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Невярна контролна сума на tar, развален архив" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Непозната заглавна част на TAR тип %u, елемент %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Невалиден подпис на архива" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Грешка при четене на заглавната част на елемента на архива" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Невалидна заглавна част %s на елемента на архива" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Невалидна заглавна част на елемента на архива" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Архивът е твърде кратък" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Неуспех при четенето на заглавните части на архива" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Извикан е DropNode за все още използван възел" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Грешка при намирането на хеш-елемента!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Неуспех при установяване на отклонението" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Вътрешна грешка в AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Двойно добавяне на отклонение %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Дублиран конфигурационен файл %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Неуспех при запис на файл %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Пътят %s е твърде дълъг" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Разпакетиране на %s повече от веднъж" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Директорията %s е отклонена" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Пътят за отклонение е твърде дълъг" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Директорията %s се заменя с не-директория" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Неуспех при намирането на възел в неговия хеш" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Пътят е твърде дълъг" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файловете се заменят със съдържанието на пакета %s без версия" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s заменя този в пакет %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Неуспех при получаването на атрибути за %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Това не е валиден DEB архив, липсва елемент „%s“" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Контролен файл, невъзможен за анализ" @@ -2390,495 +2392,500 @@ msgstr "" "забранено от потребителя." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%liд %liч %liм %liс" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%liч %liм %liс" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%liм %liс" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%liс" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Изборът %s не е намерен" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестен тип на абревиатура: „%c“" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Отваряне на конфигурационен файл %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтактична грешка %s:%u: В началото на блока няма име." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " "ниво" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Синтактична грешка %s:%u: директивата clear изисква аргумент дърво от опции" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Грешка!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Готово" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Неизвестна опция за команден ред „%c“ [от %s]." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Опцията за команден ред %s не е разпозната" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Опцията за команден ред %s не е булева" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Опция %s изисква аргумент." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Опция %s: Значението трябва да има =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Опция %s изисква аргумент цяло число, не „%s“" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Опция „%s“ е твърде дълга" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Смисълът %s не е ясен, опитайте true или false." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Невалидна операция %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Проблем при затваряне на компресираният файл %s (gzip)" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Под-процесът %s получи сигнал %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Проблем при затваряне на компресираният файл %s (gzip)" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Неуспех при отварянето на файлов манипулатор %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Неуспех при създаването на подпроцес IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Неуспех при изпълнението на компресиращата програма " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "грешка при четене, все още има %llu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "преименуването се провали, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "В %s няма инсталиран ключодържател." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Празен кеш на пакети" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Файлът за кеш на пакети е повреден" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Файлът за кеш на пакети е несъвместима версия" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Файлът за кеш на пакети е повреден, твърде малък е" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Тази версия на APT не поддържа система за версии „%s“" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Кешът на пакети е бил направен за различна архитектура" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Зависи от" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Предварително зависи от" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Предлага се" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Препоръчва се" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "В конфликт с" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Заменя" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Изважда от употреба" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Чупи" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Подобрява" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "важен" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "изискван" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "стандартен" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "незадължителен" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "допълнителен" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Изграждане на дървото със зависимости" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Версии кандидати" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Генериране на зависимости" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Четене на информацията за състоянието" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Неуспех при отварянето на StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Неуспех при запис на временен StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Неуспех при анализирането на пакетен файл %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма " "стойност)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2887,12 +2894,12 @@ msgstr "" "Неуспех при незабавната настройка на „%s“. За повече информация вижте " "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Неуспех при конфигуриране на „%s“. " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2904,12 +2911,12 @@ msgstr "" "пакет %s. Това често е лошо, но ако наистина искате да го направите, " "активирайте опцията APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не се поддържа индексен файл от типа „%s“" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2917,7 +2924,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2925,92 +2932,92 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Директорията със списъци %spartial липсва." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Директорията за архиви %spartial липсва." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Неуспех при заключване на директорията %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Изтегляне на файл %li от %li (остават %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Изтегляне на файл %li от %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Неуспех при намирането на драйвер за метод %s." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Пакетната система „%s“ не е поддържана" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Неуспех при определянето на подходяща пакетна система" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Неуспех при получаването на атрибути на %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " "или отворени." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3019,102 +3026,97 @@ msgstr "" "Стойността „%s“ на APT::Default-Release не е правилна, понеже в източниците " "няма такова издание" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестен тип за отбиване %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Няма указан приоритет (или е нула) на отбиването" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Кешът има несъвместима система за версии" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Възникна грешка при обработката на %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " "APT." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Еха, надхвърлихте броя описания, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Четене на списъците с пакети" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "преименуването се провали, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Несъответствие на контролната сума" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Несъответствие на размера" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Невалидна операция %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3123,16 +3125,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3141,12 +3143,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3156,12 +3158,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3170,79 +3172,79 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Неуспех при анализиране на файл Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Във файла Release %s липсват раздели" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Във файла Release %s липсва контролна сума" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Неправилна стойност за „Date“ във файла Release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Блокът на производителя %s не съдържа отпечатък" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Използване на точка за монтиране на CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтиране на CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Чакане за диск...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Монтиране на CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Идентифициране..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Запазен етикет: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Демонтиране на CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Сканиране на диска за индексни файлове...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3251,7 +3253,7 @@ msgstr "" "Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu " "индекса с преводи и %zu подписа.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3259,16 +3261,16 @@ msgstr "" "Не са намерени файлове с пакети. Мое би дискът не е с Дебиан или е за " "погрешна компютърна архитектура." -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Намерен е етикет „%s“\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Това не е валидно име, опитайте отново.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3277,34 +3279,34 @@ msgstr "" "Наименование на този диск: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записани са %i записа с %i липсващи файла.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записани са %i записа с %i несъответстващи файла\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" @@ -3319,37 +3321,37 @@ msgstr "Не е намерен oторизационен запис за: %s" msgid "Hash mismatch for: %s" msgstr "Несъответствие на контролната сума за: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Неуспех при намиране на задача „%s“" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3358,59 +3360,59 @@ msgstr "" "Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ " "понеже той няма нито едната" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не е възможно избиране на на последната версия за пакета „%s“, защото е " "виртуален" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма " "подходящ кандидати" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е " "инсталиран" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Подготовка за приемане на решение" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" "Външната програма за удовлетворяване на зависимости се провали без да изведе " "съобщение за грешка" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Изпълняване на външна програма за удовлетворяване на зависимости" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Изпълняване на dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3418,120 +3420,120 @@ msgstr "" "Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или " "са използвани по-стари." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Инсталиране на %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Окончателно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Отбелязване на изчезването на %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Изпълнение на тригер след инсталиране %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Директорията „%s“ липсва" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Неуспех при отваряне на файла „%s“" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неуспех при записа на %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Операцията е прекъсната" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Поради достигане на максималния брой доклади (MaxReports) не е записан нов " "доклад за зависимостите." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "отлагане на настройката поради неудовлетворени зависимости" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3539,7 +3541,7 @@ msgstr "" "Доклад за зависимостите не е записан защото съобщението за грешка е породено " "от друга грешка." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3547,7 +3549,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3555,7 +3557,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчна оперативна памет" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3564,13 +3566,13 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3579,7 +3581,7 @@ msgstr "" "Неуспех при заключване на административната директория (%s). Може би се " "използва от друг процес?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3588,7 +3590,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3596,7 +3598,7 @@ msgstr "" "Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно " "изпълнение на „%s“." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Без заключване" diff --git a/po/bs.po b/po/bs.po index ba1935da2..c45c578dd 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -15,156 +15,156 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Ukupno naziva paketa:" -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Ukupno naziva paketa:" -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normalni paketi:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Čisto virtuelni paketi:" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pojedinačni virutuelni paketi:" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Miješani virtuelni paketi:" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Nedostajući:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Ukupno različitih verzija:" -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "Ukupno različitih verzija:" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Ukupno zavisnosti:" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Ukupno Verzija/Datoteka odnosa:" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "Ukupno Verzija/Datoteka odnosa:" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Paketi nisu pronađeni" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalirano:" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -201,28 +201,28 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Ne mogu otvoriti %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -258,65 +258,65 @@ msgstr "" " -c=? Pročitaj ovu konfiguracijsku datoteku\n" " -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, c-format msgid "Can not find a package for architecture '%s'" msgstr "" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "" @@ -336,151 +336,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -526,7 +526,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 msgid "Must specify at least one pair url/filename" msgstr "" @@ -534,7 +534,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -547,53 +547,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "ali nije instaliran" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Ne mogu otvoriti %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -620,7 +620,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -668,173 +668,175 @@ msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi." msgid "Disk not found." msgstr "Datoteka nije pronađena" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Prijavljujem se" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Greška pri čitanju" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 #, fuzzy msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Greška pri pisanju" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Neuspješno" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "" @@ -870,7 +872,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" @@ -900,182 +902,182 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Unutrašnja greška" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1083,37 +1085,37 @@ msgid "" " ?] " msgstr "" -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Odustani." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Da li želite nastaviti?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1123,15 +1125,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1147,15 +1149,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1165,7 +1167,7 @@ msgid_plural "" msgstr[0] "Slijedeći NOVI paketi će biti instalirani:" msgstr[1] "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1173,23 +1175,23 @@ msgid_plural "" msgstr[0] "Slijedeći NOVI paketi će biti instalirani:" msgstr[1] "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1197,173 +1199,173 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Oštećeni paketi" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ali nije instaliran" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ili" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "" -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1372,7 +1374,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1380,90 +1382,90 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr "" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Urađeno" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 msgid "Internal error, Upgrade broke stuff" msgstr "" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Urađeno" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1471,43 +1473,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Ne mogu otvoriti %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "" -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "" -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "" -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr "" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1517,19 +1519,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "" @@ -1558,11 +1560,11 @@ msgstr "Ne mogu otvoriti %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "" @@ -1600,7 +1602,7 @@ msgstr "" msgid "Merging available information" msgstr "Sastavljam dostupne informacije" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1614,41 +1616,41 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1690,217 +1692,217 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je bila oštećena, datoteka preimenovana u %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stara, pokušavam nadogradnju %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, fuzzy, c-format msgid "Unable to open DB file %s: %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Ne mogu otvoriti %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, c-format msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -1932,157 +1934,157 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Ne mogu izvršiti gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Oštećena arhiva" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arhiva je prekratka" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Putanja je preduga" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "" @@ -2140,495 +2142,500 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 #, c-format -msgid "Could not open file %s" +msgid "Problem closing the gzip file %s" msgstr "" #: apt-pkg/contrib/fileutl.cc:1093 +#, c-format +msgid "Could not open file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Odustajem od instalacije." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Zavisi" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Unaprijed zavisi" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Predlaže" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Preporučuje" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 #, fuzzy msgid "Conflicts" msgstr "Sukobljava se sa" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Zamjenjuje" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Zastarijeva" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "važno" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "zahtijevano" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcionalno" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Verzije kandidata" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "Sastavljam dostupne informacije" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Ne mogu otvoriti %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2636,229 +2643,224 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Ne mogu kreirati %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Čitam spisak datoteke" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, c-format msgid "Is the package %s installed?" msgstr "" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Čitam spiskove paketa" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2866,149 +2868,149 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Pogrešan CD" + +#: apt-pkg/cdrom.cc:592 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "" -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Pogrešan CD" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3023,254 +3025,254 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ne mogu zapisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/ca.po b/po/ca.po index a30f1fd28..c9c50ff60 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -18,155 +18,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquet %s versió %s té una dependència sense satisfer:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Nombre total de paquets: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Nombre total d'estructures de paquets: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Paquets normals: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Paquets virtuals purs: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Paquets virtuals únics: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Paquets virtuals mixtes: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Falten: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Nombre total de versions diferents: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Nombre total de descripcions diferents: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Nombre total de dependències: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Nombre total de relacions versió/fitxer: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Nombre total de relacions descripció/fitxer: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Nombre total dels mapes aportats: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Nombre total de cadenes globals: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Nombre total de l'espai per a dependències de versió: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Nombre total de l'espai desaprofitat: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Nombre total de l'espai atribuït a: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "No s'han trobat paquets" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Heu de donar com a mínim un patró de cerca" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Fitxers de paquets:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Paquets etiquetats:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(no trobat)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instaŀlat: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(cap)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -240,28 +240,28 @@ msgstr "" "Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més " "informació.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Inseriu un disc en la unitat i premeu Intro" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No s'ha pogut muntar «%s» a «%s»" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetiu aquest procés per a la resta de CD del vostre joc." @@ -297,47 +297,47 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Descarta la versió «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instaŀlat manualment.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "S'ha marcat %s com instaŀlat automàticament.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -345,20 +345,20 @@ msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» " "en el seu lloc." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" @@ -385,81 +385,81 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -468,18 +468,18 @@ msgstr "" "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " "APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -488,7 +488,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè %s no és permès als " "paquets «%s»" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +497,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +513,7 @@ msgstr "" "La dependència %s per a %s no es pot satisfer perquè la versió candidata del " "paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +522,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -637,7 +637,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Haureu d'especificar un paquet de codi font per a baixar" @@ -646,7 +646,7 @@ msgstr "Haureu d'especificar un paquet de codi font per a baixar" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -659,53 +659,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s no es pot marcar perquè no està instaŀlat.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s ja estava marcat com instaŀlat manualment.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s ja estava marcat com instaŀlat automàticament.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s ja estava retingut.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s ja estava no retingut.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "S'ha marcat %s com retingut.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "S'ha cancel·lat la marca de retenció en %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "L'execució del dpkg ha fallat. Sou root?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -732,7 +732,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -780,52 +780,52 @@ msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." msgid "Disk not found." msgstr "No s'ha trobat el disc" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI no vàlid, els URI locals no han de començar per //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "S'està accedint a" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "No es pot determinar el nom de la màquina distant" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "No es pot determinar el nom local" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "El servidor ha rebutjat la nostra connexió i ha dit: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -833,122 +833,124 @@ msgstr "" "S'ha especificat un servidor intermediari però no un script d'accés, " "Acquire::ftp::ProxyLogin està buit." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Temps de connexió finalitzat" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Error de lectura" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Una resposta ha desbordat la memòria intermèdia." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Error d'escriptura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "No s'ha pogut crear un sòcol" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Ha fallat" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "No s'ha pogut connectar amb el sòcol passiu." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte" # abastar? huh? jm -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "No s'ha pogut vincular a un connector" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "No s'ha pogut escoltar sobre el sòcol" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "No s'ha pogut determinar el nom del sòcol" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "No es pot enviar l'ordre PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "La família d'adreces %u és desconeguda (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "S'ha esgotat el temps de connexió al sòcol de dades" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "S'ha esgotat el temps d'espera per al sòcol de dades" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "No es pot invocar" @@ -984,7 +986,7 @@ msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" @@ -1014,40 +1016,40 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar el «gpgv» per a verificar la signatura (està " "instaŀlat el gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1055,120 +1057,120 @@ msgstr "" "Les signatures següents no s'han pogut verificar perquè la clau pública no " "està disponible:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vàlids" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Aquest servidor HTTP té el suport d'abast trencat" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Error intern" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "S'ha d'obtenir %sB d'arxius.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1176,31 +1178,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1211,19 +1213,19 @@ msgstr "" "Per continuar escriviu la frase «%s»\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Avortat." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Voleu continuar?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1231,19 +1233,19 @@ msgstr "" "No es poden baixar alguns arxius, proveu a executar apt-get update o " "intenteu-ho amb --fix-missing." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "S'està avortant la instaŀlació." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1257,17 +1259,17 @@ msgstr[1] "" "Els següents paquets han desaparegut del vostre sistema ja\n" "que tots els fitxers s'han sobreescrit per altres paquets:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1285,15 +1287,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1304,7 +1306,7 @@ msgstr[0] "" msgstr[1] "" "Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1314,17 +1316,17 @@ msgstr[0] "" msgstr[1] "" "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo." msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1332,7 +1334,7 @@ msgstr "" "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " "especifiqueu una solució)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1344,145 +1346,145 @@ msgstr "" "«unstable» i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han introduït des d'«Incoming»." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Paquets trencats" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "S'instaŀlaran els següents paquets extres:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " o" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1490,27 +1492,27 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" @@ -1519,7 +1521,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[S/n]" @@ -1527,91 +1529,91 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències…" -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " ha fallat." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Fet" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho emprant -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització… " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Fet" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1623,43 +1625,43 @@ msgstr "" " Tingueu en ment que el bloqueig està desactivat,\n" " per tant, no es depèn de la situació actual real." -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "No s'ha pogut canviar el nom de %s a %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Obj " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Bai:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "S'ha baixat %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Treballant]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1672,19 +1674,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" @@ -1713,11 +1715,11 @@ msgstr "No es pot llegir el fitxer rèplica «%s»" msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" @@ -1760,7 +1762,7 @@ msgstr "" msgid "Merging available information" msgstr "S'està fusionant la informació disponible" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1784,40 +1786,40 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "La llista de les extensions dels paquets és massa llarga" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "S'ha produït un error en processar el directori %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "La llista d'extensions de les fonts és massa llarga" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1898,26 +1900,26 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració arbitrària" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "No s'ha trobat cap selecció" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1925,192 +1927,192 @@ msgstr "" "El format de la base de dades és invàlid. Si heu actualitzat des d'una " "versió més antiga de l'apt, suprimiu i torneu a crear la base de dades." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No es pot llegir el directori %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No es pot veure l'estat %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Els errors s'apliquen al fitxer " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "No s'ha pogut resoldre %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "L'arbre està fallant" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "No s'ha pogut obrir %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "No s'ha pogut llegir l'enllaç %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "No s'ha pogut alliberar %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No s'ha pogut enllaçar %s a %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - No s'ha pogut assignar espai en memòria" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "No es pot obrir %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Línia predominant %s malformada %llu núm 1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Línia predominant %s malformada %llu núm 1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Línia predominant %s malformada %llu núm 2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Línia predominant %s malformada %llu núm 3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorisme de compressió desconegut '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La sortida comprimida %s necessita un joc de compressió" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "No s'ha pogut crear FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "No s'ha pogut bifurcar" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Comprimeix el fil" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2163,157 +2165,157 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "No es poden crear els conductes" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Arxiu corromput" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Signatura de l'arxiu no vàlida" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "La capçalera %s del membre de l'arxiu no és vàlida" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "La capçalera del membre de l'arxiu no és vàlida" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "L'arxiu és massa petit" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Ha fallat la lectura de les capçaleres de l'arxiu" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode crida a un node que encara està enllaçat" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "No s'ha trobat l'element diseminat!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "No s'ha pogut assignar la desviació" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "S'ha produït un error intern en AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Afegit doble d'una desviació %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fitxer de conf. duplicat %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "La ruta %s és massa llarga" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "S'està desempaquetant %s més d'una vegada" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "El directori %s està desviat" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "La ruta de desviació és massa llarga" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directori %s està sent reemplaçat per un no-directori" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "No s'ha trobat el node dins de la taula" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "La ruta és massa llarga" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "No es pot veure l'estat de %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error intern, no s'ha pogut localitzar al membre %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "El fitxer de control no es pot analitzar" @@ -2374,210 +2376,205 @@ msgstr "" "està deshabilitat per l'usuari." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreujament de tipus no reconegut: «%c»" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "S'està obrint el fitxer de configuració %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error sintàctic %s:%u: No comença el camp amb un nom." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error sintàctic %s:%u: Etiqueta malformada" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error sintàctic %s:%u Text extra després del valor" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error sintàctic %s:%u: Inclusió des d'aquí" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Error sintàctic %s:%u: la directiva clear requereix un arbre d'opcions com a " "argument" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s… Error!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s… Fet" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "…" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s… %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "L'opció de la línia d'ordres «%c» [de %s] és desconeguda." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "No s'entén l'opció de la línia d'ordres %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "No és lògica l'opció de la línia d'ordres %s" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "L'opció de la línia d'ordres %s precisa un paràmetre." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =<val>" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "L'opció %s precisa un paràmetre numèric, no '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "L'opció '%s' és massa llarga" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "El sentit %s no s'entén, proveu «true» (vertader) o «false» (fals)." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operació no vàlida %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Ha hagut un problema en tancar el fitxer gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fitxer de blocat %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "No es pot crear la llista de fitxers perquè «%s» no és un directori" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "S'està descartant «%s» al directori «%s» perquè no té extensió del nom de " "fitxer" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2585,280 +2582,290 @@ msgstr "" "S'està descartant «%s» al directori «%s» perquè té una extensió del nom de " "fitxer invàlida" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "El sub-procés %s ha rebut un senyal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Ha hagut un problema en tancar el fitxer gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "No s'ha pogut obrir el descriptor del fitxer %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "No s'ha pogut crear el subprocés IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "No s'ha pogut executar el compressor " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "llegits, falten %llu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "No s'ha instaŀlat cap clauer a %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Memòria cau de paquets és buida" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "El fitxer de memòria cau de paquets està corromput" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "El fitxer de memòria cau de paquets és una versió incompatible" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "El fitxer de memòria cau de paquets està corromput, és massa petit" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Aquest APT no suporta el sistema de versions «%s»" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Depèn" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Predepèn" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Suggereix" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recomana" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Entra en conflicte" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Reemplaça" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Fa obsolet" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Trenca" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Millora" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "requerit" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "estàndard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependències" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versions candidates" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Dependències que genera" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "S'està llegint la informació de l'estat" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "No s'ha pogut obrir el fitxer d'estat %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2867,12 +2874,12 @@ msgstr "" "No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt." "conf, sota APT::Immediate-Configure per a més detalls. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "No s'ha pogut configurar «%s»." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2884,19 +2891,19 @@ msgstr "" "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "El tipus de fitxer índex «%s» no està suportat" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2904,92 +2911,92 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets retinguts." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directori de llistes %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Falta el directori d'arxius %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "No es pot blocar el directori %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "S'està obtenint el fitxer %li de %li (falten %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "S'està obtenint el fitxer %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament «%s» no està suportat" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "No es pot veure l'estat de %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Heu de posar algunes URI 'font' en el vostre sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Potser voldreu executar apt-get update per a corregir aquests problemes" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -2998,104 +3005,99 @@ msgstr "" "El valor «%s» és invàlid per a APT:Default-Release donat que aquest " "llançament no és disponible a les fonts" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "No s'ha entès el pin de tipus %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "La memòria cau té un sistema de versions incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "S'ha produït un error en processar %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Uau, heu excedit el nombre de descripcions que aquest APT és capaç de " "gestionar. " -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, heu excedit el nombre de dependències que aquest APT és capaç de " "gestionar." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "La mida no concorda" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operació no vàlida %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3104,16 +3106,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3122,12 +3124,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3138,12 +3140,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3153,12 +3155,12 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3166,67 +3168,67 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "No es pot analitzar el fitxer Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "No hi ha seccions al fitxer Release %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "No hi ha una entrada Hash al fitxer Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "El camp «Date» al fitxer Release %s és invàlid" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "S'està desmuntant el CD-ROM…\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc…\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM…\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "S'està identificant…" -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "S'està desmuntant el CD-ROM…\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "S'està analitzant el disc per a fitxers d'índex…\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3235,7 +3237,7 @@ msgstr "" "S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de " "traduccions i %zu signatures\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3243,16 +3245,16 @@ msgstr "" "No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la " "arquitectura és incorrecta?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "S'ha trobat l'etiqueta «%s»\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3261,34 +3263,34 @@ msgstr "" "El disc es diu:\n" "«%s»\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets…" -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3305,39 +3307,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:479 +#: apt-pkg/cacheset.cc:487 #, 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:482 +#: apt-pkg/cacheset.cc:490 #, 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:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "No s'ha pogut trobar la tasca «%s»" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3346,57 +3348,57 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està " "instaŀlada" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Envia l'escenari al resoledor" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Envia la petició al resoledor" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Prepara per a rebre una solució" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "El resoledor extern ha fallat sense un missatge d'error adient" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Executa un resoledor extern" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "S'està executant dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3404,118 +3406,118 @@ msgstr "" "Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han " "emprat els antics." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "S'està instaŀlant %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "S'està suprimint el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "S'ha suprimit completament %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "S'està anotant la desaparició de %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "S'està executant l'activador de postinstaŀlació %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Manca el directori «%s»" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "No s'ha pogut obrir el fitxer «%s»" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "S'ha instaŀlat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a la supressió del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "S'ha suprimit el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a suprimir completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No es pot escriure en %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "S'ha interromput l'operació abans que pogués finalitzar" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "S'han produït problemes de depències, es deixa sense configurar" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3523,7 +3525,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que és un error " "consequent de una fallida anterior." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3531,7 +3533,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3539,7 +3541,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3548,14 +3550,14 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida " "d'E/S del dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3564,14 +3566,14 @@ msgstr "" "No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre " "procés utilitzant-lo?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "No es pot blocar el directori d'administració (%s), sou root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3579,7 +3581,7 @@ msgstr "" "S'ha interromput el dpkg, hauríeu d'executar manualment «%s» per a corregir " "el problema." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "No blocat" diff --git a/po/cs.po b/po/cs.po index 70b3cde8b..9e49d1058 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -17,153 +17,153 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>=2 && n<=4 ? 1 : 2;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verze %s má nesplněné závislosti:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Celkem názvů balíků: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Celkem struktur balíků: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normálních balíků: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Čistě virtuálních balíků: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálních balíků: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Smíšených virtuálních balíků: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Chybějících: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Celkem různých verzí: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Celkem různých popisů: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Celkem závislostí: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Celkem vztahů ver/soubor: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Celkem vztahů popis/soubor: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Celkem poskytnutých mapování: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Celkem globovaných řetězců: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Celkem místa závislých verzí: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Celkem jalového místa: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Celkem přiřazeného místa: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je špatně synchronizovaný." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Musíte zadat alespoň jeden vyhledávací vzor" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Soubory balíku:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Vypíchnuté balíky:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nenalezeno)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalovaná verze: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(žádná)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Vypíchnutý balík: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pro %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -232,28 +232,28 @@ msgstr "" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" "Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Zadejte prosím název tohoto média, např. „Debian 5.0.3 Disk 1“" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte prosím médium do mechaniky a stiskněte enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Selhalo připojení „%s“ na „%s“" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Tento proces opakujte pro všechna zbývající média." @@ -289,47 +289,47 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s nastaven jako instalovaný automaticky.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -337,19 +337,19 @@ msgstr "" "Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark " "manual“." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Nelze zamknout adresář pro stahování" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" @@ -374,80 +374,80 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -456,17 +456,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -475,20 +475,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -497,7 +497,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -506,30 +506,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -616,7 +616,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" @@ -625,7 +625,7 @@ msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové text msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -638,53 +638,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s nemůže být označen, protože není nainstalovaný.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s již byl nastaven jako instalovaný ručně.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s již byl nastaven jako instalovaný automaticky.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s již byl podržen v aktuální verzi.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s již nebyl držen v aktuální verzi.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s bude podržen v aktuální verzi.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Podržení balíku %s v aktuální verzi bylo zrušeno.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Spuštění dpkg selhalo. Jste root?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -730,7 +730,7 @@ msgstr "" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" "Více informací viz manuálové stránky apt-mark(8) a apt.conf(5)." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -778,52 +778,52 @@ msgstr "Nelze odpojit CD-ROM v %s - možná se stále používá." msgid "Disk not found." msgstr "Disk nebyl nalezen." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokální URI nesmí začínat na //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Přihlašuji se" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Nelze určit jméno druhé strany" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Nelze určit lokální jméno" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Server zamítl naše spojení a řekl: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER selhal, server řekl: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS selhal, server řekl: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -831,121 +831,123 @@ msgstr "" "Byl zadán proxy server, ale ne přihlašovací skript. Acquire::ftp::ProxyLogin " "je prázdný." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE selhal, server řekl: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Čas spojení vypršel" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Chyba čtení" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Odpověď přeplnila buffer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Chyba zápisu" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Nelze vytvořit socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Nelze připojit datový socket, čas spojení vypršel" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Selhalo" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Nelze připojit pasivní socket." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal naslouchající socket" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Nelze navázat socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Nelze naslouchat na socketu" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Nelze určit jméno socketu" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Nelze odeslat příkaz PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznámá rodina adres %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT selhal, server řekl: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Spojení datového socketu vypršelo" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Nelze přijmout spojení" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problém s kontrolním součtem souboru" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nelze stáhnout soubor, server řekl „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Datový socket vypršel" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Přenos dat selhal, server řekl „%s“" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Nelze vyvolat " @@ -981,7 +983,7 @@ msgstr "Nelze se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" @@ -1011,36 +1013,36 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - msgid "Unable to connect to %s:%s:" msgstr "Nelze se připojit k %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1048,147 +1050,147 @@ msgstr "" "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný " "klíč:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Prázdné soubory nejsou platnými archivy" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Vnitřní chyba" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po této operaci bude na disku použito dalších %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po této operaci bude na disku uvolněno %sB.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1199,19 +1201,19 @@ msgstr "" "Pro pokračování opište frázi „%s“\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Přerušeno." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Chcete pokračovat?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1219,19 +1221,19 @@ msgstr "" "Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Nelze opravit chybějící balíky." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1248,15 +1250,15 @@ msgstr[2] "" "Následující balíky z tohoto systému zmizely, protože\n" "všechny jejich soubory byly přepsány jinými balíky:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1274,15 +1276,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, AutoRemover pokazil věci" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1294,7 +1296,7 @@ msgstr[1] "" msgstr[2] "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1303,18 +1305,18 @@ msgstr[0] "%lu balík byl nainstalován automaticky a již není potřeba.\n" msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n" msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“." msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“." msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1322,7 +1324,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1333,145 +1335,145 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Poškozené balíky" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Autentizační varování potlačeno.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Instalovat tyto balíky bez ověření?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " nebo" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1479,27 +1481,27 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" @@ -1508,7 +1510,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[Y/n]" @@ -1516,92 +1518,92 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Opravuji závislosti…" -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " selhalo." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Nelze opravit závislosti" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Nelze minimalizovat sadu pro aktualizaci" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Hotovo" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit „apt-get -f install“." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci… " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Hotovo" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1613,43 +1615,43 @@ msgstr "" " Mějte také na paměti, že je vypnuto zamykání, tudíž\n" " tyto výsledky nemusí mít s realitou nic společného!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Selhalo přejmenování %s na %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Cíl " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Mám:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Staženo %sB za %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Pracuji]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1662,19 +1664,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Nelze číst %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nelze přejít do %s" @@ -1703,11 +1705,11 @@ msgstr "Nelze číst soubor se zrcadly „%s“" msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" @@ -1745,7 +1747,7 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova msgid "Merging available information" msgstr "Slučuji dostupné informace" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1768,40 +1770,40 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Nelze zapsat do %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Seznam rozšíření balíku je příliš dlouhý" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Chyba zpracování adresáře %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Seznam zdrojových rozšíření je příliš dlouhý" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Chyba při zapisování hlavičky do souboru" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1881,26 +1883,26 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Žádný výběr nevyhověl" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Některé soubory chybí v balíkovém souboru skupiny %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je porušená, soubor přejmenován na %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1908,192 +1910,192 @@ msgstr "" "Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " "prosím odstraňte a poté ji znovu vytvořte." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nelze otevřít DB soubor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Nelze vyhodnotit %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Nelze získat kurzor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nelze číst adresář %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nelze vyhodnotit %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Chyby se týkají souboru " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Chyba při zjišťování %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Průchod stromem selhal" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Nelze otevřít %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkování %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Nelze přečíst link %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Nelze odlinkovat %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nezdařilo se slinkovat %s s %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Selhal pokus o přidělení paměti" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nelze otevřít %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Zkomolený override soubor %s, řádek %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nezdařilo se přečíst override soubor %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Zkomolený override soubor %s, řádek %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Zkomolený override soubor %s, řádek %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Zkomolený override soubor %s, řádek %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámý kompresní algoritmus „%s“" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potřebuje kompresní sadu" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Selhalo vytvoření FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Volání fork() se nezdařilo" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Komprimovat potomka" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "V/V operace s podprocesem/souborem selhala" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Chyba čtení při výpočtu MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2145,157 +2147,157 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Selhalo vytvoření roury" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Selhalo spuštění gzipu " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Porušený archiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolní součet taru selhal, archiv je poškozený" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznámá hlavička TARu typ %u, člen %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Neplatný podpis archivu" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Chyba při čtení záhlaví prvku archivu" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Neplatné záhlaví prvku archivu %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Neplatné záhlaví prvku archivu" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Archiv je příliš krátký" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Chyba při čtení hlaviček archivu" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Nelze lokalizovat hashovací prvek!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nelze alokovat diverzi" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Vnitřní chyba při AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojí přidání diverze %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je příliš dlouhá" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Rozbaluji %s vícekrát" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Adresář %s je odkloněn" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Diverzní cesta je příliš dlouhá" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresář %s bude nahrazen neadresářem" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Cesta je příliš dlouhá" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Přepsat vyhovující balík bez udání verze pro %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Soubor %s/%s přepisuje ten z balíku %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Nelze vyhodnotit %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Toto není platný DEB archiv, chybí část „%s“" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vnitřní chyba, nemohu najít část %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Nezpracovatelný kontrolní soubor" @@ -2354,484 +2356,489 @@ msgstr "" "zakázáno." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Výběr %s nenalezen" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná zkratka typu: „%c“" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Otevírám konfigurační soubor %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Zkomolená značka" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Syntaktická chyba %s:%u: Direktiva clear vyžaduje jako argument strom " "možností" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s… Chyba!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s… Hotovo" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "…" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s… %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Parametr příkazové řádky „%c“ [z %s] je neznámý" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Nerozumím parametru %s příkazové řádky" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Parametr příkazové řádky %s není pravdivostní hodnota" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Volba %s vyžaduje argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =<hodn>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne „%s“" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Volba „%s“ je příliš dlouhá" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Nechápu význam %s, zkuste true nebo false." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Neplatná operace %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problém při zavírání gzip souboru %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Nelze získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s obdržel signál %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problém při zavírání gzip souboru %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nelze otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Nelze otevřít popisovač souboru %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Nelze vytvořit podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Nezdařilo se spustit kompresor " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problém při zavírání souboru %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "přejmenování selhalo, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "V %s není nainstalována žádná klíčenka." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Cache balíků je prázdná" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Cache soubor balíků je poškozen" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Cache soubor balíků má nekompatibilní verzi" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Cache soubor balíků je poškozen, je příliš malý" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tato APT nepodporuje systém pro správu verzí „%s“" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Cache balíků byla vytvořena pro jinou architekturu" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Předzávisí na" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Doporučuje" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Nahrazuje" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Zastarává" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Porušuje" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Rozšiřuje" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "důležitý" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "vyžadovaný" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standardní" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "volitelný" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Vytváří se strom závislostí" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Kandidátské verze" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Čtu stavové informace" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Nelze otevřít stavový soubor %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Nelze zapsat dočasný stavový soubor %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2840,12 +2847,12 @@ msgstr "" "Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " "5 apt.conf v části APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Nelze nastavit „%s“." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2856,18 +2863,18 @@ msgstr "" "smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně " "chcete udělat, aktivujte možnost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexový typ souboru „%s“ není podporován" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2875,89 +2882,89 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Adresář seznamů %spartial chybí." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Nelze uzamknout adresář %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Stahuji soubor %li z %li (%s zbývá)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Stahuji soubor %li z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Ovladač metody %s nemohl být nalezen." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuštěna správně" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém „%s“ není podporován" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Nebylo možno vyhodnotit %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Do sources.list musíte zadat „zdrojové“ URI" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -2966,97 +2973,92 @@ msgstr "" "Hodnota „%s“ není v APT::Default-Release platná, protože toto vydání není " "dostupné v sources.list" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Neplatný záznam v souboru preferencí %s, chybí hlavička Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Nerozumím vypíchnutí typu %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Cache má nekompatibilní systém správy verzí" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Chyba při zpracování %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wow, překročili jste počet jmen balíků, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, překročili jste počet verzí, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Čtu seznamy balíků" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "přejmenování selhalo, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Neshoda kontrolních součtů" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Neplatná operace %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3065,16 +3067,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3083,12 +3085,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3098,12 +3100,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3112,79 +3114,79 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento " "balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Nelze zpracovat Release soubor %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Release soubor %s neobsahuje žádné sekce" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Release soubor %s neobsahuje Hash záznam" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Neplatná položka „Valid-Until“ v Release souboru %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Neplatná položka „Date“ v Release souboru %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Odpojuji CD-ROM…\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Čekám na disk…\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM…\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Rozpoznávám… " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Uložený název: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Odpojuji CD-ROM…\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Hledám na disku indexové soubory…\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3193,7 +3195,7 @@ msgstr "" "Nalezeny indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a " "podpisy (%zu)\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3201,16 +3203,16 @@ msgstr "" "Nenalezeny žádné balíky. Možná to není disk s Debianem, nebo je pro jinou " "architekturu?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Nalezený název: „%s“\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3219,34 +3221,34 @@ msgstr "" "Tento disk se nazývá: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků…" -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsáno %i záznamů.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" @@ -3261,37 +3263,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze „%s“ pro „%s“ nebyla nalezena" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Nelze najít úlohu „%s“" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3300,51 +3302,51 @@ msgstr "" "Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože " "žádné takové verze nemá" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, 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" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Scénář odeslán řešiteli" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Požadavek odeslán řešiteli" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Příprava na obdržení řešení" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Spuštění externího řešitele" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Spouštím dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3352,119 +3354,119 @@ msgstr "" "Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou " "použity starší verze." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Instaluji %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Kompletně odstraňuji %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Značím si zmizení %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Spouštím poinstalační spouštěč %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Adresář „%s“ chybí" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Nelze otevřít soubor „%s“" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nelze zapsat do %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Operace byla přerušena dříve, než mohla skončit" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problémy se závislostmi - ponechávám nezkonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3472,7 +3474,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "se jedná o chybu způsobenou předchozí chybou." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3480,7 +3482,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3488,7 +3490,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněnou pamětí." -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3497,34 +3499,34 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje " "chybu V/V dpkg." -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "Nelze uzamknout administrační adresář (%s). Používá jej jiný proces?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Nelze uzamknout administrační adresář (%s). Jste root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Není uzamčen" diff --git a/po/cy.po b/po/cy.po index 6700b0aa1..ae663b74c 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -15,174 +15,174 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 #, fuzzy msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -255,19 +255,11 @@ msgstr "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -275,12 +267,20 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -317,66 +317,66 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" @@ -396,96 +396,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +494,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +503,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -519,7 +519,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -528,32 +528,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -640,7 +640,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" @@ -649,7 +649,7 @@ msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -662,53 +662,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Methwyd agor %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -735,7 +735,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -787,52 +787,52 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, fuzzy, c-format msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -841,124 +841,126 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -994,7 +996,7 @@ msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -1024,190 +1026,190 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:530 +#: methods/http.cc:522 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/server.cc:176 +#: methods/server.cc:171 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/server.cc:199 +#: methods/server.cc:194 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/server.cc:201 +#: methods/server.cc:196 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/server.cc:494 +#: methods/server.cc:489 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1218,19 +1220,19 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Erthylu." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Ydych chi eisiau mynd ymlaen?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1238,20 +1240,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1261,15 +1263,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1285,16 +1287,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1304,7 +1306,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1312,18 +1314,18 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1332,7 +1334,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1344,150 +1346,150 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1497,27 +1499,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1526,7 +1528,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1534,92 +1536,92 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " wedi methu." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Wedi Gorffen" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Wedi Gorffen" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1627,43 +1629,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Methwyd ailenwi %s at %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Presennol " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Cyrchu:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Anwybyddu " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Gwall " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Gweithio]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, fuzzy, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1676,19 +1678,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@ -1717,11 +1719,11 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -1765,7 +1767,7 @@ msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" # FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 #, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" @@ -1790,41 +1792,41 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, fuzzy, c-format msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, fuzzy, c-format msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -1906,220 +1908,220 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Methwydd darllen y ffeil dargyfeirio %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 #, fuzzy msgid "Compress child" msgstr "Plentyn Cywasgu" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, fuzzy, c-format msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" # FIXME: "debian" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2173,162 +2175,162 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Llofnod archif annilys" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Pennawd aelod archif annilys" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Pennawd aelod archif annilys" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Mae'r archif yn rhy fyr" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Methwyd darllen pennawdau'r archif" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Methyd lleoli yr elfen <hash>!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Methwyd neilltuo dargyfeiriad" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 #, fuzzy msgid "Internal error in AddDiversion" msgstr "Gwall Mewnol yn AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" # FIXME: "the" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Mae'r llwybr %s yn rhy hir" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Yn dadbacio %s mwy nag unwaith" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Mae llwybr y dargyfeiriad yn rhy hir" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Mae'r llwybr yn rhy hir" # FIXME: wtf? -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, fuzzy, c-format msgid "Internal error, could not locate member %s" msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 #, fuzzy msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" @@ -2388,513 +2390,518 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Gwall!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Wedi Gorffen" # FIXME -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gwall wrth gau'r ffeil" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gwall wrth gau'r ffeil" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "methwyd ailenwi, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Yn Erthylu'r Sefydliad." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Mae'r ffeil storfa pecyn yn llygredig" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, fuzzy, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Methwyd agor %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" # FIXME: number? -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2905,12 +2912,12 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2918,7 +2925,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2926,54 +2933,54 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, c-format msgid "Is the package %s installed?" msgstr "" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2981,39 +2988,39 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." # FIXME: ...file -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3021,103 +3028,98 @@ msgid "" msgstr "" # FIXME: literal -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" # FIXME: tense -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "methwyd ailenwi, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3125,28 +3127,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3154,13 +3156,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3169,12 +3171,12 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3182,128 +3184,128 @@ msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." # FIXME: number? -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" # FIXME: number? -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" + +#: apt-pkg/cdrom.cc:592 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "" -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "CD Anghywir" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3318,88 +3320,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3408,167 +3410,167 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/da.po b/po/da.po index 36abe8cd7..a450013dc 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,156 +20,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Samlet antal pakkenavne: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Samlet antal pakkestrukturer: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normale pakker: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Rene virtuelle pakker: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Enkelte virtuelle pakker: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Blandede virtuelle pakker: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Manglende: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Totale forskellige versioner: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Sammenlagt forskellige beskrivelser: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Sammenlagt afhængigheder: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Sammenlagt version/fil-relationer: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Sammenlagt version/fil-relationer: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Sammenlagt »Tilbyder«-markeringer: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Totalle søgemønsterstrenge: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Total afhængighedsversions-plads: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Total »Slack«-plads: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Total plads, der kan gøres rede for: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefilen %s er ude af trit." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Fandt ingen pakker" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Du skal angive mindst ét søgemønster" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" # Overskriften til apt-cache policy, # forkorter "Package" væk. CH -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "»Pinned« pakker:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(ikke fundet)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Installeret: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pakke-pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versionstabel:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompileret på %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -239,33 +239,34 @@ msgstr "" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" -"Der kunne ikke detekteres et cd-rom-drev eller findes et monteringspunkt.\n" -"Du kan prøve tilvalget --cdrom for at angive cd-rom-monteringspunktet. Se " -"»man apt-cdrom« for yderligere information om automatisk detektering af cd-" -"rom og monteringspunkt." - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Angiv venligst et navn for denne disk, som f.eks. »Debian 5.0.3 Disk 1«" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Indsæt en disk i drevet og tryk retur" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Kunne ikke montere %s til %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +#, fuzzy +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" +"Der kunne ikke detekteres et cd-rom-drev eller findes et monteringspunkt.\n" +"Du kan prøve tilvalget --cdrom for at angive cd-rom-monteringspunktet. Se " +"»man apt-cdrom« for yderligere information om automatisk detektering af cd-" +"rom og monteringspunkt." + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gentag processen for resten af cd'erne i dit sæt." @@ -301,47 +302,47 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, c-format msgid "Can not find a package for architecture '%s'" msgstr "Kan ikke finde en pakke for arkitektur »%s«" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Kan ikke finde en pakke »%s« med version »%s«" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Kan ikke finde en pakke »%s« med udgivelse »%s«" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vælger »%s« som kildepakke fremfor »%s«\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Kan ikke finde version »%s« for pakke »%s«" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s sat til automatisk installation.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -349,19 +350,19 @@ msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark " "manual« i stedet for." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" @@ -386,78 +387,78 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil »%s«\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i »hent-kun«-tilstand" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken »dpkg-dev« er installeret.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,17 +467,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,7 +485,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -492,14 +493,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -508,7 +509,7 @@ msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " "kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -517,30 +518,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -628,7 +629,7 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har »Super Cow Powers«.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" @@ -637,7 +638,7 @@ msgstr "Du skal angive mindst én pakke at hente kildeteksten til" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -650,53 +651,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s kan ikke markeres, da den ikke er installeret.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s var allerede sat til manuelt installeret.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s var allerede sat til automatisk installeret.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s var allerede sat i bero.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s var allerede ikke i bero.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s sat i bero.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Afbrød i bero for %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -744,7 +745,7 @@ msgstr "" "tmp\n" "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 #, fuzzy msgid "" "Usage: apt [options] command\n" @@ -806,52 +807,52 @@ msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI, lokale URI'er må ikke starte med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Logget på" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Kunne ikke bestemme serverens navn" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Kunne ikke bestemme det lokale navn" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serveren nægtede os forbindelse og sagde: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -859,121 +860,123 @@ msgstr "" "Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::" "ProxyLogin er tom." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Logpå-skriptets kommando »%s« mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Tidsudløb på forbindelsen" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Læsefejl" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Mellemlageret blev overfyldt af et svar." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Skrivefejl" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Kunne ikke oprette sokkel" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Mislykkedes" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Kunne ikke forbinde passiv sokkel." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunne ikke få en lyttesokkel" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Kunne ikke tilknytte en sokkel" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Kunne ikke lytte på soklen" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Kunne ikke finde soklens navn" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Kunne ikke sende PORT-kommando" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukendt adressefamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Tidsudløb på datasokkel-forbindelse" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunne ikke hente fil. Serveren sagde »%s«" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Tidsudløb ved datasokkel" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverførsel mislykkedes, serveren sagde »%s«" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Forespørgsel" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Kunne ikke udføre " @@ -1009,7 +1012,7 @@ msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" @@ -1039,23 +1042,23 @@ msgstr "Der skete noget underligt under opløsning af »%s:%s« (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke køre »gpgv« for at verificere signaturen (er gpgv installeret?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1064,15 +1067,15 @@ msgstr "" "Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke " "autentificering?)" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1080,148 +1083,149 @@ msgstr "" "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er " "tilgængelig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Http-serveren sendte et ugyldigt svarhovede" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understøttelse af intervaller (»ranges«)" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Intern fejl" # måske visning, kategorisering -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "Listing" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "Mystisk... Størrelserne passede ikke, skriv til apt@packages.debian.org" +msgstr "" +"Mystisk... Størrelserne passede ikke, skriv til apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Trivial Only« angivet, men dette er ikke en triviel handling." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ja, gør som jeg siger!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1232,19 +1236,19 @@ msgstr "" "For at fortsætte, skal du skrive »%s«\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Afbryder." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Vil du fortsætte?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1252,19 +1256,19 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« " "eller prøv med --fix-missing." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Afbryder installationen." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1278,17 +1282,17 @@ msgstr[1] "" "De følgende pakker forsvandt fra dit system, da\n" "alle filer er blevet overskrevet af andre pakker:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " "AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1306,15 +1310,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover ødelagde noget" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1325,7 +1329,7 @@ msgstr[0] "" msgstr[1] "" "Følgende pakker blev installeret automatisk, og behøves ikke længere:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1334,17 +1338,17 @@ msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n" msgstr[1] "" "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Brug »apt-get autoremove« til at fjerne den." msgstr[1] "Brug »apt-get autoremove« til at fjerne dem." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at køre »apt-get -f install«:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1352,7 +1356,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv " "en løsning)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1363,142 +1367,142 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Ødelagte pakker" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Installér disse pakker uden verifikation?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "installeret,kan opgraderes til: " -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 msgid "[installed,local]" msgstr "[Installeret,lokalt]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 msgid "[installed,automatic]" msgstr "[Installeret,automatisk]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 msgid "[installed]" msgstr "[Installeret]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, fuzzy, c-format msgid "[upgradable from: %s]" msgstr "[kan opgraderes fra: " -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "[residual-konfig]" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1506,27 +1510,27 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" @@ -1535,7 +1539,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[J/n]" @@ -1543,90 +1547,90 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Retter afhængigheder ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " mislykkedes." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhængigheder" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssættet" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Færdig" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "Sortering" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "»update«-kommandoen benytter ingen parametre" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen ... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 msgid "Internal error, Upgrade broke stuff" msgstr "Intern fejl, opgradering blev afbrudt" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Færdig" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "Fuldtekst-søgning" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "ikke en reel pakke (virtuel)" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1638,43 +1642,43 @@ msgstr "" " Husk også at låsning er deaktiveret,\n" " så stol ikke på relevansen for den reelle aktuelle situation!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, c-format msgid "Failed to parse %s. Edit again? " msgstr "Kunne ikke fortolke %s. Rediger igen? " -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format 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:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Havde " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Henter:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ignorerer " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Fejl " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Hentede %sB på %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Arbejder]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1687,19 +1691,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" @@ -1728,11 +1732,11 @@ msgstr "Ingen post fundet i spejlfil »%s«" msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" @@ -1775,7 +1779,7 @@ msgstr "" msgid "Merging available information" msgstr "Sammenfletter tilgængelighedsoplysninger" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1799,40 +1803,40 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke finde debconfs version. Er debconf installeret?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Pakkeudvidelseslisten er for lang" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Fejl under behandling af mappen %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Kildeudvidelseslisten er for lang" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Fejl under skrivning af hovedet til indholdsfil" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1912,26 +1916,26 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Sæt en opsætnings-indstilling" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Ingen valg passede" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Visse filer mangler i pakkefilgruppen »%s«" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var ødelagt, filen omdøbt til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er gammel, forsøger at opgradere %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1939,193 +1943,193 @@ msgstr "" "Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af " "apt, så fjern og genskab databasen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunne ikke åbne DB-filen %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markør" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Kunne ikke læse mappen %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kunne ikke finde %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "F: Fejlene vedrører filen " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Kunne ikke omsætte navnet %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Trævandring mislykkedes" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Kunne ikke åbne %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Kunne ikke »readlink« %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Kunne ikke frigøre %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Kunne ikke lænke %s til %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Nåede DeLink-begrænsningen på %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr "" " %s har ingen linje med tilsidesættelse af standard for binøre filer\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Kunne ikke allokere hukommelse" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kunne ikke åbne %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Ugyldig gennemtvangs %s-linje %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Kunne ikke læse gennemtvangsfilen %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Ugyldig gennemtvangs %s-linje %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Ugyldig gennemtvangs %s-linje %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Ugyldig gennemtvangs %s-linje %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukendt komprimeringsalgoritme »%s«" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerede uddata %s kræver et komprimeringssæt" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Kunne ikke oprette FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Kunne ikke spalte" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern fejl. Kunne ikke oprette %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "IO til underproces/fil mislykkedes" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Kunne ikke læse under beregning af MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problem under aflænkning af %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2178,157 +2182,157 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Kunne ikke oprette videreførsler" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Kunne ikke udføre gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-tjeksum fejlede, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukendt TAR-hovedtype %u, element %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Fejl under læsning af arkivelements hoved" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Ugyldigt arkivelementhoved %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Ugyldigt arkivelementhoved" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Kunne ikke læse arkivhovederne" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode kaldt med endnu forbundet knude" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Kunne ikke finde hash-element!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Kunne ikke allokere omrokering" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern fejl i AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbelt tilføjelse af omrokering %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opsætningsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkede %s ud flere gange" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Mappen %s er omrokeret" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Omrokeringsstien er for lang" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappen %s bliver erstattet af en ikke-mappe" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Kunne ikke finde knuden i sin hash-bucket" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Overskriv pakkematch uden version for %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Kunne ikke finde %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern fejl, kunne ikke finde elementet %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Ikke-tolkbar kontrolfil" @@ -2389,481 +2393,486 @@ msgstr "" "bruger." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukendt type-forkortelse: »%c«" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Åbner konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfejl %s:%u: Blokken starter uden navn." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfejl %s:%u: Forkert udformet mærke" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfejl %s:%u: Inkluderet herfra" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "Syntaksfejl %s:%u: ryd direktiv kræver et tilvalgstræ som argument" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fejl!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Færdig" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "..." #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s... %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Kommandolinjetilvalget %s blev ikke forstået" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjetilvalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Tilvalget %s kræver et parameter." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Tilvalget %s kræver et heltalligt parameter, ikke »%s«" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Tilvalget »%s« er for langt" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s blev ikke forstået, prøv med »true« eller »false«." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig handling %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem under lukning af gzip-filen %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke åbne låsefilen %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke låsning for nfs-monteret låsefil %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opnå låsen %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s modtog en signal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem under lukning af gzip-filen %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åbne filen %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Kunne ikke åbne filbeskrivelse %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Kunne ikke oprette underproces IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Kunne ikke udføre komprimeringsprogram " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "læs, mangler stadig at læse %llu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "omdøbning mislykkedes, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Ingen nøglering installeret i %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Tomt pakke-mellemlager" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Pakke-mellemlagerets fil er ødelagt" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Pakke-mellemlagerets fil er af en inkompatibel version" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT understøtter ikke versionssystemet »%s«" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Afhængigheder" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Præ-afhængigheder" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Foreslåede" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Anbefalede" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Konflikter" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Overflødiggør" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Ødelægger" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Forbedringer" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "vigtig" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "krævet" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "frivillig" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ekstra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Opbygger afhængighedstræ" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Kandidatversioner" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Afhængighedsgenerering" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Læser tilstandsoplysninger" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Kunne ikke åbne StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Kunne ikke skrive den midlertidige StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Åbner %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2872,12 +2881,12 @@ msgstr "" "Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt." "conf under APT:Immediate-Cinfigure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Kunne ikke åbne filen »%s«. " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2889,19 +2898,19 @@ msgstr "" "ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-" "LoopBreak«." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiler af typen »%s« understøttes ikke" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2909,89 +2918,89 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappen %spartial mangler." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Kunne ikke låse mappen %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Henter fil %li ud af %li (%s tilbage)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Henter fil %li ud af %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Metodedriveren %s blev ikke fundet." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Tjek om pakken »dpkg-dev« er installeret.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet »%s« understøttes ikke" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Kunne ikke finde %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du skal have nogle »source«-URI'er i din sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan muligvis rette problemet ved at køre »apt-get update«" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3000,98 +3009,93 @@ msgstr "" "Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke " "er tilgængelig i kilderne" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Kunne ikke forstå pin-type %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Der opstod en fejl under behandlingen af %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "omdøbning mislykkedes, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hashsum stemmer ikke" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 msgid "Invalid file format" msgstr "Ugyldigt filformat" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3100,17 +3104,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3119,12 +3123,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3134,12 +3138,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3148,78 +3152,78 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Kunne ikke fortolke udgivelsesfil %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Ingen afsnit i udgivelsesfil %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Intet hashpunkt i udgivelsesfil %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Leverandørblok %s inderholder intet fingeraftryk" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger CD-ROM-monteringspunktet %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Afmonterer CD-ROM ...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Venter på disken ...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificerer ... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Gemt mærkat: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Afmonterer CD-ROM ...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Skanner disken for indeksfiler ...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3228,7 +3232,7 @@ msgstr "" "Fandt %zu pakkeindekser, %zu kildeindekser, %zu oversættelsesindekser og %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3236,16 +3240,16 @@ msgstr "" "Kunne ikke finde nogen pakkefiler, det er muligvis ikke en Debiandisk eller " "den forkerte arkitektur?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Fandt mærkatet »%s«\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prøv igen.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3254,34 +3258,34 @@ msgstr "" "Denne disk hedder: \n" "»%s«\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" @@ -3296,37 +3300,37 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsum stemmer ikke: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunne ikke finde opgaven »%s«" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3335,53 +3339,53 @@ msgstr "" "Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke " "har nogen af dem" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Kan ikke vælge installeret version fra pakke %s da den ikke er installeret" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Send scenarie til problemløser" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Send forespørgsel til problemløser" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Forbered for modtagelse af løsning" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Kør ekstern problemløser" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "Status: [%3i%%]" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Kører dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3389,119 +3393,119 @@ msgstr "" "Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle " "bruges i stedet." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Sætter %s op" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Fjerner %s helt" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Bemærker forsvinding af %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Kører førinstallationsudløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Mappe »%s« mangler" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Kunne ikke åbne filen »%s«" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Klargør %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Gør klar til at sætte %s op" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Gør klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Gør klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive log (%s)" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "Er /dev/pts monteret?" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "Er standardud en terminal?" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Handling blev afbrudt før den kunne afsluttes" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3509,14 +3513,14 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en " "opfølgningsfejl fra en tidligere fejl." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3524,7 +3528,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3532,12 +3536,12 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale " "system" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3545,20 +3549,20 @@ msgid "" msgstr "" "Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Ikke låst" diff --git a/po/de.po b/po/de.po index c62f3c9f1..5173b68cf 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,157 +20,157 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;>\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s Version %s hat eine unerfüllte Abhängigkeit:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Gesamtzahl an Paketnamen: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Gesamtzahl an Paketstrukturen: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " davon gewöhnliche Pakete: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " davon rein virtuelle Pakete: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " davon einzelne virtuelle Pakete: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " davon gemischte virtuelle Pakete: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " davon fehlend: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Gesamtzahl an unterschiedlichen Versionen: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Gesamtzahl an Abhängigkeiten: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Gesamtzahl an Version/Datei-Beziehungen: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Gesamtzahl an Bereitstellungen: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Gesamtzahl an Mustern: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Gesamtmenge an Slack: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Gesamtmenge an Speicher: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Keine Pakete gefunden" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Sie müssen mindestens ein Suchmuster angeben" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark " "showauto«." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Paket %s kann nicht gefunden werden." -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Paketdateien:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht " "möglich" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Mit Pinning verwaltete Pakete:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nicht gefunden)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Installiert: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Installationskandidat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(keine)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Paket-Pinning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versionstabelle:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s, kompiliert am %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -241,32 +241,32 @@ msgstr "" "Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n" "und apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Bitte geben Sie einen Namen für dieses Medium an, wie zum Beispiel »Debian " "5.0.3 Disk 1«" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "" "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die " "Eingabetaste (Enter)." -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "»%s« konnte nicht in »%s« eingebunden werden." -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes." @@ -304,47 +304,47 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert." -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s wurde als automatisch installiert festgelegt.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -352,21 +352,21 @@ msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« " "und »apt-mark manual«." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt." -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen." -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." @@ -393,80 +393,80 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -475,18 +475,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -495,7 +495,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen " "nicht erlaubt ist." -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -504,14 +504,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " "ist zu neu." -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -521,7 +521,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -530,30 +530,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -648,7 +648,7 @@ msgstr "" "bezüglich weitergehender Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -659,7 +659,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -672,54 +672,54 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "" "Markierung für %s kann nicht gesetzt werden, da es nicht installiert ist.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s wurde bereits auf manuell installiert gesetzt.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s wurde bereits auf automatisch installiert gesetzt.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s wurde bereits auf Halten gesetzt.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s auf Halten gesetzt.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Halten-Markierung für %s entfernt.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -767,7 +767,7 @@ msgstr "" "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n" "weitergehender Informationen und Optionen." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -817,53 +817,53 @@ msgstr "" msgid "Disk not found." msgstr "Medium nicht gefunden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen." #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Anmeldung läuft" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Name des Kommunikationspartners kann nicht bestimmt werden." -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Lokaler Name kann nicht bestimmt werden." -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Verbindung durch Server abgelehnt; Server meldet: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Befehl USER fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -871,123 +871,125 @@ msgstr "" "Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::" "ProxyLogin ist leer." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Befehl TYPE fehlgeschlagen: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Zeitüberschreitung der Verbindung" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Lesefehler" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Schreibfehler" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Socket konnte nicht erzeugt werden." -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden." -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Fehlgeschlagen" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Passiver Socket konnte nicht verbunden werden." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "" "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket " "gefunden." -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Verbindung des Sockets nicht möglich" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Warten auf Verbindungen auf dem Socket nicht möglich" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Name des Sockets konnte nicht bestimmt werden." -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "PORT-Befehl konnte nicht gesendet werden." -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Unbekannte Adressfamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Befehl EPRT fehlgeschlagen: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden." -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problem bei Bestimmung des Hashwertes einer Datei" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Zeitüberschreitung bei Datenverbindung" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Abfrage" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Aufruf nicht möglich: " @@ -1025,7 +1027,7 @@ msgstr "Verbindung mit %s:%s nicht möglich (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Verbindung mit %s" @@ -1055,40 +1057,40 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)." msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " "jedoch nicht ermittelt werden?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv " "installiert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1097,100 +1099,100 @@ msgstr "" "öffentlicher\n" "Schlüssel nicht verfügbar ist:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gültiges Archiv sein." -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen." -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Warten auf Kopfzeilen" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Ungültige Kopfzeile" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt." -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt." -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt." -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "" "Teilweise Dateiübertragung wird vom HTTP-Server nur fehlerhaft unterstützt." -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Interner Fehler" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " @@ -1198,52 +1200,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet." -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ja, tue was ich sage!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1254,19 +1256,19 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Abbruch." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Möchten Sie fortfahren?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden." -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1274,19 +1276,19 @@ msgstr "" "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " "update« ausführen oder mit »--fix-missing« probieren?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt." -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Fehlende Pakete konnten nicht korrigiert werden." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Installation abgebrochen." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1300,16 +1302,16 @@ msgstr[1] "" "Die folgenden Pakete verschwanden von Ihrem System, da alle\n" "Dateien von anderen Paketen überschrieben wurden:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden." -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1328,16 +1330,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, AutoRemover hat etwas beschädigt." -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1350,7 +1352,7 @@ msgstr[1] "" "Die folgenden Pakete wurden automatisch installiert und werden nicht mehr " "benötigt:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1360,17 +1362,17 @@ msgstr[0] "" msgstr[1] "" "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen." msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1378,7 +1380,7 @@ msgstr "" "Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " "eines Pakets (oder geben Sie eine Lösung an)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1390,146 +1392,146 @@ msgstr "" "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n" "nicht erstellt wurden oder Incoming noch nicht verlassen haben." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Beschädigte Pakete" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Authentifizierungswarnung überstimmt.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden." -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Diese Pakete ohne Überprüfung installieren?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installiert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Installiert]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Installiert]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Installiert]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " oder" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1537,27 +1539,27 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" @@ -1566,7 +1568,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[J/n]" @@ -1574,91 +1576,91 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Abhängigkeiten werden korrigiert ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " fehlgeschlagen." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Abhängigkeiten konnten nicht korrigiert werden." -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden." -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Fertig" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente." -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt." -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Fertig" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1671,43 +1673,43 @@ msgstr "" " sind, verlassen Sie sich also bezüglich des reellen aktuellen\n" " Status der Sperre nicht darauf!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s konnte nicht in %s umbenannt werden." -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "OK " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Holen: " -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Fehl " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Es wurden %sB in %s geholt (%sB/s).\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Wird verarbeitet]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1720,19 +1722,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s kann nicht gelesen werden." -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Es konnte nicht nach %s gewechselt werden." @@ -1761,12 +1763,12 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" @@ -1808,7 +1810,7 @@ msgstr "" msgid "Merging available information" msgstr "Verfügbare Informationen werden zusammengeführt." -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1832,41 +1834,41 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Schreiben nach %s nicht möglich" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Paketerweiterungsliste ist zu lang." -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Fehler beim Verarbeiten von Verzeichnis %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Quellerweiterungsliste ist zu lang." -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhalte %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1953,26 +1955,26 @@ msgstr "" " -c=? diese Konfigurationsdatei lesen\n" " -o=? eine beliebige Konfigurationsoption setzen" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Keine Auswahl traf zu" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«." -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern." -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1981,192 +1983,192 @@ msgstr "" "einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank " "und erstellen Sie sie neu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s mit »stat« abfragen fehlgeschlagen" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Archiv hat keinen Steuerungsdatensatz." -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Unmöglich, einen Cursor zu bekommen" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s mit »stat« abfragen nicht möglich.\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "F: Fehler gehören zu Datei " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s konnte nicht aufgelöst werden." -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Öffnen von %s fehlgeschlagen" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "readlink von %s fehlgeschlagen" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Entfernen (unlink) von %s fehlgeschlagen" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Archiv hatte kein Feld »package«" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Betreuer ist %s und nicht %s.\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Speicheranforderung fehlgeschlagen" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s konnte nicht geöffnet werden." #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Missgestaltetes Override %s Zeile %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Override-Datei %s konnte nicht gelesen werden." -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Missgestaltetes Override %s Zeile %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Missgestaltetes Override %s Zeile %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Missgestaltetes Override %s Zeile %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Unbekannter Komprimierungsalgorithmus »%s«" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz." -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "FILE* konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Fork fehlgeschlagen" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Komprimierungs-Kindprozess" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Interner Fehler, %s konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problem beim Entfernen (unlink) von %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "%s konnte nicht in %s umbenannt werden." -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2220,157 +2222,157 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden." -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "gzip konnte nicht ausgeführt werden." -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Beschädigtes Archiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Ungültige Archiv-Signatur" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Ungültige Archivbestandteil-Kopfzeile %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Ungültige Archivdatei-Kopfzeilen" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Archiv ist zu kurz." -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden." -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Hash-Element konnte nicht gefunden werden!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Umleitung konnte nicht reserviert werden." -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Interner Fehler in »AddDiversion«" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Datei %s konnte nicht geschrieben werden." -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Datei %s konnte nicht geschlossen werden." -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Der Pfad %s ist zu lang." -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s mehr als einmal entpackt" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Das Verzeichnis %s ist umgeleitet." -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Der Umleitungspfad ist zu lang." -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt." -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Knoten konnte nicht in seinem Hash gefunden werden." -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Der Pfad ist zu lang." -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pakettreffer ohne Version für %s wird überschrieben." -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben." -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s mit »stat« abfragen nicht möglich" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält." -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Auswerten der »control«-Datei nicht möglich" @@ -2431,211 +2433,206 @@ msgstr "" "MMap vom Benutzer deaktiviert ist." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li d %li h %li min %li s" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%li h %li min %li s" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%li min %li s" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%li s" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nicht erkannte Typabkürzung: »%c«" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Konfigurationsdatei %s wird geöffnet" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: Eingefügt von hier" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Syntaxfehler %s:%u: Löschdirektiven benötigen einen Optionsbaum als Argument" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fehler!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fertig" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Fertig" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden." -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Befehlszeilenoption %s ist nicht Bool'sch." -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Option %s erfordert ein Argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«." -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Option »%s« ist zu lang." # Check for boolean; -1 is unspecified, 0 is yes 1 is no -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false«." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Ungültige Operation %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Einbindungspunkt %s mit »stat« abfragen nicht möglich." -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem beim Schließen der gzip-Datei %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet." -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Sperrdatei %s konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet." -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Konnte Sperre %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist." -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist." -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-" "Erweiterung hat." -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2643,283 +2640,293 @@ msgstr "" "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige " "Dateinamen-Erweiterung hat." -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Unterprozess %s hat das Signal %u empfangen." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem beim Schließen der gzip-Datei %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Datei %s konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Fehler beim Ausführen von Komprimierer " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig." -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " "nicht möglich." -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problem beim Synchronisieren der Datei" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Kein Schlüsselring in %s installiert" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Leerer Paketzwischenspeicher" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Die Paketzwischenspeicher-Datei ist beschädigt." -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "" "Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor." -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Die Paketzwischenspeicher-Datei ist beschädigt, sie ist zu klein." -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt." -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut." -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Hängt ab von" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Hängt ab von (vorher)" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Schlägt vor" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Empfiehlt" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Kollidiert mit" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Ersetzt" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Löst ab" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Beschädigt" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Wertet auf" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "wichtig" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "erforderlich" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut." -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Installationskandidat-Versionen" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Abhängigkeitsgenerierung" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Statusinformationen werden eingelesen." -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "StateFile %s konnte nicht geöffnet werden." -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Temporäres StateFile %s konnte nicht geschrieben werden." -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet." -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2928,12 +2935,12 @@ msgstr "" "»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt." "conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "»%s« konnte nicht konfiguriert werden. " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2945,12 +2952,12 @@ msgstr "" "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte " "die Option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexdateityp »%s« wird nicht unterstützt." -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2958,7 +2965,7 @@ msgstr "" "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " "gefunden werden." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2966,96 +2973,96 @@ msgstr "" "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " "dies könnte durch zurückgehaltene Pakete verursacht worden sein." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Listenverzeichnis %spartial fehlt." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Archivverzeichnis %spartial fehlt." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Das Verzeichnis %s kann nicht gesperrt werden." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Holen der Datei %li von %li (noch %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Holen der Datei %li von %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s ist nicht korrekt gestartet." -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und " "drücken Sie die Eingabetaste (Enter)." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem »%s« wird nicht unterstützt." -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s mit stat abfragen nicht möglich" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei " "eintragen." -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet " "werden." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3064,107 +3071,102 @@ msgstr "" "Der Wert »%s« ist für APT::Default-Release ungültig, da solch eine " "Veröffentlichung in den Paketquellen nicht verfügbar ist." -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Pinning-Typ %s kann nicht interpretiert werden." -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem." #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese " "APT-Version umgehen kann." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese " "APT-Version umgehen kann." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen " "diese APT-Version umgehen kann." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen " "diese APT-Version umgehen kann." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden." -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hash-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Größe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Ungültige Operation %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3173,17 +3175,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3192,12 +3194,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3208,12 +3210,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3223,81 +3225,81 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Release-Datei %s kann nicht verarbeitet werden." -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Keine Bereiche (Sections) in Release-Datei %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Kein Hash-Eintrag in Release-Datei %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck." -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Einbindung der CD-ROM wird gelöst ...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Warten auf Medium ...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM wird eingebunden ...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identifizieren ... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Gespeicherte Kennzeichnung: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Einbindung der CD-ROM wird gelöst ...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3306,7 +3308,7 @@ msgstr "" "%zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu " "Signaturen gefunden\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3314,16 +3316,16 @@ msgstr "" "Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine " "Debian-Disk oder eine für die falsche Architektur?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Kennzeichnung »%s« gefunden\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3332,34 +3334,34 @@ msgstr "" "Dieses Medium heißt: \n" "»%s«\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopieren der Paketlisten ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Schreiben der neuen Quellliste\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3376,39 +3378,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:479 +#: apt-pkg/cacheset.cc:487 #, 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:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Task »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3417,58 +3419,58 @@ msgstr "" "Es kann weder eine installierte Version noch ein Installationskandidat von " "Paket »%s« ausgewählt werden, da beide nicht existieren." -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es " "nicht installiert ist." -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Szenario an Problemlöser senden" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Anfrage an Problemlöser senden" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Vorbereiten, eine Lösung zu erhalten" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" "Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen." -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Externen Problemlöser ausführen" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Ausführen von dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3476,120 +3478,120 @@ msgstr "" "Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s wird installiert." -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s wird konfiguriert." -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s wird entfernt." -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s wird vollständig entfernt." -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Verschwinden von %s festgestellt" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Aufruf des Nach-Installations-Triggers %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Verzeichnis »%s« fehlt" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Datei »%s« konnte nicht geöffnet werden." -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt." -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Vollständiges Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s vollständig entfernt" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Schreiben nach %s nicht möglich" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " "erreicht ist." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3597,7 +3599,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf " "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3605,7 +3607,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3613,7 +3615,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen erschöpftem Arbeitsspeicher hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3622,14 +3624,14 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/" "Ausgabe-Fehler von Dpkg hindeutet." -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3638,7 +3640,7 @@ msgstr "" "Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von " "einem anderen Prozess verwendet?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3646,7 +3648,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3654,7 +3656,7 @@ msgstr "" "Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um " "das Problem zu beheben." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Nicht gesperrt" diff --git a/po/dz.po b/po/dz.po index 2e27d6bcb..d17a8764f 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,158 +19,158 @@ msgstr "" "X-Poedit-Country: Bhutan\n" "X-Poedit-SourceCharset: utf-8\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:" -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:" -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr "བརླག་སྟོར་ཞུགས་པ:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:" -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "རྟེན་འབྲེལ་བསྡོམས:" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་ ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(མ་ཐོབ།)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr "མི་ངོ:" -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ཅི་མེད།)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -245,29 +245,29 @@ msgstr "" "cache=/tmp\n" " ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་ཐོག་ཤོག་ལེབ་ཚུ་བལྟ།.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ཅིག་བླིན་གནང་ དཔེར་ན་ 'Debian 2.1r1 Disk 1'བཟུམ།" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།" @@ -303,65 +303,65 @@ msgstr "" " -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" " -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" @@ -381,116 +381,116 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -499,37 +499,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -618,7 +618,7 @@ msgstr "" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" @@ -627,7 +627,7 @@ msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -640,53 +640,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -713,7 +713,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -762,52 +762,52 @@ msgstr "" msgid "Disk not found." msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་ ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་ཁར་འགོ་བཙུགས་ནི་མི་འོང་།" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "ནང་བསྐྱོད་འབད་དོ།" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "དོ་བཉམ་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "ཉེ་གནས་མིང་འདི་གཏན་འབེེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "སར་བར་འདི་གིས་ མཐུད་ལམ་འདི་ངོས་ལེན་འབད་མ་བཏུབ་པར་སླབ་མས: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "ལག་ལེན་པ་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "རྩི་སྤྲོད་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -815,121 +815,123 @@ msgstr "" "པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདཝ་ད་ ནང་བསྐྱོད་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::" "ProxyLoginའདི་སྟོངམ་ཨིན་པས།" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འཐོས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "མཐུད་ལམ་ངལ་མཚམས" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གིས་སླབ་མས:%s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་'%s'་གིས་སླབ་མས།" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "འདྲི་དཔྱད།" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" @@ -965,7 +967,7 @@ msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" @@ -995,137 +997,137 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་ msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "ནང་འཁོད་ཀྱི་འཛོལ་བ་ གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་" "ཡོད!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་ ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་" @@ -1133,52 +1135,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1189,20 +1191,20 @@ msgstr "" "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "བར་བཤོལ་འབད།" -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 #, fuzzy msgid "Do you want to continue?" msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1210,19 +1212,19 @@ msgstr "" "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་ apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-" "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1232,15 +1234,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1256,16 +1258,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1275,7 +1277,7 @@ msgid_plural "" msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1283,17 +1285,17 @@ msgid_plural "" msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1301,7 +1303,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1312,146 +1314,146 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 #, fuzzy msgid "Install these packages without verification?" msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr "ཡང་ན།" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1459,27 +1461,27 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" @@ -1488,7 +1490,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1496,91 +1498,91 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "ཝའི།" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།" -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr "འབད་ཚར་ཡི།" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1588,43 +1590,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "ཨེབ།" -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "ལེན:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "ཨེལ་ཇི་ཨེན:" -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "ཨི་ཨར་ཨར།" -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [ལཱ་འབད་དོ།]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1637,19 +1639,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།" @@ -1678,11 +1680,11 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" @@ -1726,7 +1728,7 @@ msgstr "" msgid "Merging available information" msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1750,40 +1752,40 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1867,26 +1869,26 @@ msgstr "" " -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n" " -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་ %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1895,192 +1897,192 @@ msgstr "" "ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་" "པ་ཅིན་ རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་ གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། " -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "ཨི:" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "ཌབ་ལུ:" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2135,157 +2137,157 @@ msgstr "" " -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་ ནང་འཁོད་ཀྱི་འཛོལ་བ།" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།" @@ -2343,496 +2345,501 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... འཛོལ་བ་!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... འབད་ཚར་ཡོད།" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... འབད་ཚར་ཡོད།" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན།" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་ བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "རྟེནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "མི་མཐུནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "ཚབ་བཙུགསཔ་ཨིན།" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "གལ་ཅན།" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "དགོས་མཁོ་ཡོདཔ།" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "ཚད་ལྡན།" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "གདམ་ཁ་ཅན།" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ཐེབས།" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "མི་ངོ་འཐོན་རིམཚུ།" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "བརྟེན་པའི་བཟོ་བཏོན།" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2844,12 +2851,12 @@ msgstr "" "འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་" "ལྡན་བཟོ།" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2857,7 +2864,7 @@ msgstr "" "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" "མ་ཐོབ།" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2865,216 +2872,211 @@ msgstr "" "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3082,12 +3084,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3096,102 +3098,102 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "ངོས་འཛིན་འབད་དོ..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་ %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསྐྱེད།\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3200,34 +3202,34 @@ msgstr "" "ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིན།\n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3244,88 +3246,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3334,167 +3336,167 @@ msgstr "" "ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" "རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/el.po b/po/el.po index 4d28fdb1d..2124388bc 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -28,154 +28,154 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Το πακέτο %s με έκδοση %s έχει ανικανοποίητες εξαρτήσεις:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Συνολικά Ονόματα Πακέτων : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Συνολο Δομών Πακέτου : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Κανονικά Πακέτα: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Πλήρως Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Μονά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Μικτά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr "Αγνοούμενα: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Σύνολο Διαφορετικών Εκδόσεων: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Σύνολο Διαφορετικών Εκδόσεων: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Σύνολο Εξαρτήσεων: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Σύνολο Αντιστοιχίσεων Παροχών: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Σύνολο Κοινών Στοιχειοσειρών : " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Σύνολο χώρου ασφαλείας: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Συνολικός Καταμετρημένος Χώρος: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβο αναζήτησης" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Αρχεία Πακέτου:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Καθηλωμένα Πακέτα:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(δε βρέθηκαν)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Εγκατεστημένα: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Υποψήφιο: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(κανένα)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Καθήλωση Πακέτου: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -250,29 +250,29 @@ msgstr "" " -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n" "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Παρακαλώ δώστε ένα όνομα για αυτόν τον δίσκο, όπως 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Αποτυχία σύνδεσης του %s σε %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας." @@ -309,69 +309,69 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "το %s έχει εγκατασταθεί αυτόματα\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" @@ -391,96 +391,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +489,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +497,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +513,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +522,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -630,7 +630,7 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -641,7 +641,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -654,53 +654,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "αλλά δεν είναι εγκατεστημένο" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Αποτυχία ανοίγματος του %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -727,7 +727,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -775,52 +775,52 @@ msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μ msgid "Disk not found." msgstr "Ο δίσκος δεν βρέθηκε." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Μη έγκυρο URI, τα τοπικά URI δεν πρέπει να αρχίζουν με //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Σύνδεση στο σύστημα" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Αδύνατος ο καθορισμός του ονόματος του ομότιμου (peer)" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Αδύνατος ο καθορισμός του τοπικού ονόματος" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Ο διακομιστής αρνήθηκε την σύνδεση με μήνυμα: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Η εντολή USER απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Η εντολή PASS απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -828,121 +828,123 @@ msgstr "" "Ο διαμεσολαβητής έχει οριστεί αλλά χωρίς σενάριο εισόδου, το Acquire::ftp::" "ProxyLogin είναι άδειο" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Το μήνυμα απάντησης υπερχείλισε την ενδιάμεση μνήμη." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Σφάλμα εγγραφής" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Απέτυχε" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Αδύνατη η αποστολή της εντολής PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Λήξη χρόνου υποδοχής δεδομένων" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Επερώτηση" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" @@ -978,7 +980,7 @@ msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" @@ -1008,18 +1010,18 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" @@ -1027,22 +1029,22 @@ msgstr "" "εγκατεστημένο το gpgv;)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1050,97 +1052,97 @@ msgstr "" "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " "διαθέσιμο το δημόσιο κλειδί:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages." @@ -1148,21 +1150,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1170,31 +1172,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1205,19 +1207,19 @@ msgstr "" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Εγκατάλειψη." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Θέλετε να συνεχίσετε;" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1225,20 +1227,20 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1248,16 +1250,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1275,15 +1277,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1293,7 +1295,7 @@ msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτ msgstr[1] "" "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1303,17 +1305,17 @@ msgstr[0] "" msgstr[1] "" "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε." msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1321,7 +1323,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1333,145 +1335,145 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " η" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1479,27 +1481,27 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" @@ -1508,7 +1510,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[Ν/ο]" @@ -1516,93 +1518,93 @@ msgstr "[Ν/ο]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[ν/Ο]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " απέτυχε." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Ετοιμο" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Ετοιμο" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1610,43 +1612,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Αποτυχία μετονομασίας του %s σε %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Hit " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Φέρε:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Αγνόησε " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Σφάλμα " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Επεξεργασία]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1659,19 +1661,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Αδύνατη η αλλαγή σε %s" @@ -1700,11 +1702,11 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" @@ -1748,7 +1750,7 @@ msgstr "" msgid "Merging available information" msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1772,40 +1774,40 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1889,26 +1891,26 @@ msgstr "" " -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" " -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Δεν ταιριαξε καμία επιλογή" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1917,192 +1919,192 @@ msgstr "" "Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη " "έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Σφάλματα στο αρχείο" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Αδύνατη η εύρεση του %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Αποτυχία ανεύρεσης" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Αποτυχία ανοίγματος του %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "Αποσύνδεση %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Αποτυχία ανάγνωσης του %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Αποτυχία αποσύνδεσης του %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr " Αποτυχία σύνδεσης του %s με το %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realoc - Αδυναμία εκχώρησης μνήμης" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Αδύνατο το άνοιγμα του %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Αποτυχία αγκίστρωσης" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Συμπίεση απογόνου" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2156,157 +2158,157 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Αποτυχία κατά την εκτέλεση του gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Κατεστραμμένη αρχειοθήκη" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Μη έγκυρη υπογραφή αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Η αρχειοθήκη είναι πολύ μικρή" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Αποτυχία εντοπισμού του στοιχείου hash!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Αδυναμία εντοπισμού εκτροπής" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Εσωτερικό Σφάλμα στο AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Διπλή προσθήκη εκτροπής %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Η διαδρομή %s έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Αποσυμπίεση του %s πάνω από μια φορά" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Ο φάκελος %s έχει εκτραπεί" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Η διαδρομή έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Αδύνατη η εύρεση της κατάστασης του %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Μη αναλύσιμο αρχείο control" @@ -2364,500 +2366,505 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Σφάλμα!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Ολοκληρώθηκε" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Ολοκληρώθηκε" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Η επιλογή %s απαιτεί ένα όρισμα." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Αποτυχία εκτέλεσης του συμπιεστή " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Εγκατάλειψη της εγκατάστασης." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Άδειο cache πακέτων" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Εξαρτάται από" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "ΠροΕξαρτάται από" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Προτείνει" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Συστήνει" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Ασύμβατο με" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Αντικαθιστά" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Απαρχαιώνει" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Χαλάει" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "σημαντικό" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "απαιτούμενο" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "καθιερωμένο" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "προαιρετικό" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "επιπλέον" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Κατασκευή Δένδρου Εξαρτήσεων" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Υποψήφιες Εκδόσεις" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2869,12 +2876,12 @@ msgstr "" "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την " "επιλογή APT::Force-LoopBreak option." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2882,7 +2889,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2890,222 +2897,217 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Ο φάκελος λιστών %spartial αγνοείται." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Αδύνατο το κλείδωμα του καταλόγου" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Λήψη αρχείου %li του %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε " "enter." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Αδύνατη η εύρεση της κατάστασης του %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " "APT." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3113,12 +3115,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3127,12 +3129,12 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3140,67 +3142,67 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Αποπροσάρτηση του CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Αναγνώριση..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Αποθήκευση Ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Αποπροσάρτηση του CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3209,22 +3211,22 @@ msgstr "" "Βρέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι " "μεταφράσεων και %zu υπογραφές\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Εύρεση ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3233,34 +3235,34 @@ msgstr "" "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" @@ -3275,88 +3277,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3365,167 +3367,167 @@ msgstr "" "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " "στη θέση τους." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Εκτέλεση του post-installation trigger %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Ο φάκελος %s αγνοείται." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Έγινε εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Αδύνατη η εγγραφή στο %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Αδύνατο το κλείδωμα του καταλόγου" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/es.po b/po/es.po index ee0d55c29..848301ee8 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -72,155 +72,155 @@ msgstr "" "X-POFile-SpellExtra: autoclean showsrc desactualizados clean gzip TYPE\n" "X-POFile-SpellExtra: sinfo Acquire\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquete %s versión %s tiene dependencias incumplidas:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Nombres de paquetes totales: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Estructuras de paquetes totales: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Paquetes normales: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Paquetes virtuales puros: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Paquetes virtuales únicos: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Paquetes virtuales mixtos: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Faltan: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Versiones diferentes totales: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Descripciones diferentes totales: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Dependencias totales: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Relaciones versión/archivo totales: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Relaciones descripción/archivo totales: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Mapeo Total de Provisiones: " # globbed -> globalizadas ? (jfs) -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Cadenas globalizadas totales: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Espacio de versión de dependencias total: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Espacio desperdiciado total: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Espacio registrado total: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "El archivo de paquetes %s está desincronizado." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "No se encontró ningún paquete" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Debe proporcionar al menos un patrón de búsqueda" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Archivos de paquetes:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Paquetes con pin:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(no encontrado)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalados: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ninguno)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pin del paquete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabla de versión:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -298,29 +298,29 @@ msgstr "" " p.ej. -o dir::cache=/tmp\n" "Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Proporcione un nombre para este disco, como pueda ser «Debian 5.0.3 Disco 1»" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor, introduzca un disco en la unidad y pulse Intro" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No se pudo montar «%s» como «%s»" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para el resto de los CDs del conjunto." @@ -357,66 +357,66 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n" " cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorar la versión no disponible «%s» del paquete «%s»" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "fijado %s como instalado automáticamente.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solución de problemas rompió algunas cosas" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" @@ -443,97 +443,97 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus dependencias de " "construcción" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -542,7 +542,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -551,14 +551,14 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -567,7 +567,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión " "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -576,30 +576,30 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando a %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -690,7 +690,7 @@ msgstr "" "para más información y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Debe especificar al menos un paquete para obtener su código fuente" @@ -699,7 +699,7 @@ msgstr "Debe especificar al menos un paquete para obtener su código fuente" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -712,53 +712,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "pero no está instalado" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "fijado %s como instalado automáticamente.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s ya está en su versión más reciente.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s ya está en su versión más reciente.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba allí" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "No se pudo abrir %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -785,7 +785,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -833,52 +833,52 @@ msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso." msgid "Disk not found." msgstr "Disco no encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, los URIS locales no deben de empezar con //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Entrando" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "No pude determinar el nombre del par" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Imposible determinar el nombre local" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "El servidor rechazó nuestra conexión y dijo: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Usuario (USER) falló, el servidor dijo: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Clave (PASS) falló, el servidor dijo: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -886,121 +886,123 @@ msgstr "" "Se especificó un servidor proxy pero no un script de entrada, «Acquire::ftp::" "ProxyLogin» está vacío." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Falló la orden «%s» del script de entrada, el servidor dijo: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Tipo (TYPE) falló, el servidor dijo: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "La conexión expiró" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "El servidor cerró la conexión" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Error de lectura" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "No pude crear un socket." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Fallo del protocolo" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Error de escritura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "No pude crear un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Falló" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "No pude conectar un socket pasivo." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo no pude obtener un socket oyente" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "No pude ligar un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "No pude escuchar en el socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "No pude determinar el nombre del socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "No pude mandar la orden PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Dirección de familia %u desconocida (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló, el servidor dijo: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Expiró conexión a socket de datos" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Se produjo un problema al hacer un hash del archivo" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Imposible traer archivo, el servidor dijo «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Expiró el socket de datos" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Falló transferencia de datos, el servidor dijo «%s»" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "No pude invocar " @@ -1036,7 +1038,7 @@ msgstr "No pude conectarme a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1066,39 +1068,39 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No se pudo conectar a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, ¡¿pero no se pudo determinar su huella " "digital?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1106,97 +1108,97 @@ msgstr "" "Las firmas siguientes no se pudieron verificar porque su llave pública no " "está disponible:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Mala línea de cabecera" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envió una cabecera de respuesta inválida" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor de http envió una cabecera de Content-Length inválida" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor de http envió una cabecera de Content-Range inválida" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Éste servidor de http tiene el soporte de alcance roto" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Error interno" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" "Los paquetes necesitan eliminarse pero está deshabilitado la posibilidad de " "eliminar." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no terminó la ordenación" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Qué raro... Los tamaños no concuerdan, mande un correo a apt@packages.debian." @@ -1204,21 +1206,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1226,31 +1228,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de esta operación.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utilizó -y sin --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especificó Trivial Only pero ésta no es una operación trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Sí, ¡haga lo que le digo!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1261,19 +1263,19 @@ msgstr "" "Para continuar escriba la frase «%s»\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Abortado." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "¿Desea continuar?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "No se pudieron descargar algunos archivos" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1281,19 +1283,19 @@ msgstr "" "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get " "update» o deba intentarlo de nuevo con --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no están soportados --fix-missing e intercambio de medio" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Abortando la instalación." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1307,16 +1309,16 @@ msgstr[1] "" "Los paquetes mostrados a continuación han desaparecido de su sistema\n" "dado que todos sus ficheros han sido sobreescritos por otros paquetes:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Dpkg realiza esto de forma automática y a propósito." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1334,15 +1336,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error interno, «AutoRemover» rompió cosas" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1355,7 +1357,7 @@ msgstr[1] "" "Los paquetes indicados a continuación se instalaron de forma automática y ya " "no son necesarios." -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1364,18 +1366,18 @@ msgstr[0] "Se instaló de forma automática %lu paquete y ya no es necesario.\n" msgstr[1] "" "Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Utilice «apt-get autoremove» para eliminarlos." msgstr[1] "Utilice «apt-get autoremove» para eliminarlos." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1383,7 +1385,7 @@ msgstr "" "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o " "especifique una solución)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1395,145 +1397,145 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Paquetes rotos" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticación ignorado.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "¿Instalar estos paquetes sin verificación?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "pero no es instalable" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "pero no está instalado" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " o" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1541,27 +1543,27 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" @@ -1570,7 +1572,7 @@ msgstr "%lu no instalados del todo o eliminados.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[S/n]" @@ -1578,91 +1580,91 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " falló." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualización" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Listo" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Listo" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1674,43 +1676,43 @@ msgstr "" " Tenga también en cuenta que se han desactivado los bloqueos,\n" " ¡no dependa de la relevancia a la situación real actual!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "No pude abrir %s.new" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Obj " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Des:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Descargados %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Trabajando]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1723,19 +1725,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "No se pudo cambiar a %s" @@ -1764,11 +1766,11 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "[Mirror: %s]" msgstr "[Réplica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "La conexión se cerró prematuramente" @@ -1812,7 +1814,7 @@ msgstr "" msgid "Merging available information" msgstr "Fusionando información disponible" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1837,40 +1839,40 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "La lista de extensión de paquetes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Error procesando el directorio %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "La lista de extensión de fuentes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Error escribiendo cabeceras de archivos de contenido" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1955,26 +1957,26 @@ msgstr "" " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Ninguna selección coincide" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD dañada, se renombró el archivo a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1982,192 +1984,192 @@ msgstr "" "El formato de la base de datos no es válido. Debe eliminar y recrear la base " "de datos si vd. se actualizó de una versión anterior de apt." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No se pudo abrir el archivo DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "No pude leer %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No se pudo leer directorio %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No se pudo leer %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Errores aplicables al archivo " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "No se pudo resolver %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Falló el recorrido por el árbol." -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "No se pudo leer el enlace %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "No se pudo desligar %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No pude enlazar %s con %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al límite de %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - No pudo reservar memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "No se pudo abrir %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Predominio mal formado %s línea %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "No se pudo leer el archivo de predominio %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Predominio mal formado %s línea %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Predominio mal formado %s línea %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Predominio mal formado %s línea %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo desconocido de compresión «%s»" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Salida comprimida %s necesita una herramienta de compresión" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "No se pudo crear FICHERO*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "No se pudo bifurcar" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Hijo compresión" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Error interno, no se pudo crear %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Falló la ES a subproceso/archivo" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "No se pudo leer mientras se computaba MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Se produjo un problema al desligar %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2222,158 +2224,158 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n" "cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "No pude crear las tuberías" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "No pude ejecutar gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Archivo dañado" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "" "Se produjo un fallo al calcular la suma de control de tar, archive dañado" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Cabecera del TAR tipo %u desconocida, miembro %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Firma del archivo inválida" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Error leyendo la cabecera de miembro del archivo" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Cabecera de miembro del archivo inválida %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Cabecera de miembro del archivo inválida" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "El archivo es muy pequeño" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "No pude leer las cabeceras del archivo" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode llamado en un nodo todavía ligado" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "¡No pude localizar el elemento enlazado!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "No pude asignar una desviación" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Error interno en AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Tratando de sobreescribir una desviación, %s -> %s y %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doble suma de desviación %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuración duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura del archivo %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "La trayectoria %s es demasiado larga" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s más de una vez" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "El directorio %s está desviado" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquete está tratando de escribir al blanco desviado %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "La trayectoria de desviación es demasiado larga" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directorio %s está siendo reemplazado por un no-directorio" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "No pude localizar el nodo en su bote de enlace" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "La trayectoria es muy larga" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescribiendo concordancia del paquete sin versión para %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "No pude leer %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este no es un archivo DEB válido, falta el miembro «%s»" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error interno, no pude localizar el miembro %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Archivo de control inanalizable" @@ -2434,494 +2436,499 @@ msgstr "" "deshabilitado el crecimiento automático." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin. %liseg." #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin. %liseg." #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin. %liseg." #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%liseg." -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Selección %s no encontrada" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo de abreviación no reconocida: «%c»" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo fichero de configuración %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error de sintaxis %s:%u: Basura extra después del valor" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Las directivas sólo se pueden poner en el primer " "nivel" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error de sintaxis %s:%u: Incluido desde aquí" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: Directiva «%s» no soportada" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Error de sintaxis %s:%u: la directiva «clear» tiene que incluir un árbol de " "opciones como argumento" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ¡Error!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hecho" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Hecho" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "No se conoce la opción de línea de órdenes «%c» [de %s]." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "No se entiende la opción de línea de órdenes %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "La opción de línea de órdenes %s no es un booleano" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "La opción %s necesita un argumento." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Opción %s: La especificación del elemento de configuración debe tener un " "=<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "La opción %s exige un argumento entero, no «%s»" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opción «%s» demasiado larga" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "El sentido %s no se entiende, pruebe verdadero o falso." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operación inválida: %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "No se puede obtener información del punto de montaje %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Se produjo un problema al cerrar el fichero gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo «%s»" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibió un fallo de segmentación." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "El subproceso %s recibió la señal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvió un código de error (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s terminó de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Se produjo un problema al cerrar el fichero gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "No se pudo abrir el descriptor de fichero %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "No se pudo crear el subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "No se pudo ejecutar el compresor " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "leídos, todavía debía leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Se produjo un problema al cerrar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Se produjo un problema al desligar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Se produjo un problema al sincronizar el fichero" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "falló el cambio de nombre, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "No se instaló ningún anillo de claves %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Caché de paquetes vacía." -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "El archivo de caché de paquetes está dañado" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "El archivo de caché de paquetes es una versión incompatible" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "El archivo de caché de paquetes está dañado" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Esta versión de APT no soporta el sistema de versiones «%s»" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "La caché de paquetes se había creado para una arquitectura diferente" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Sugiere" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Entra en conflicto" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Reemplaza" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Hace obsoleto" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Rompe" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Mejora" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "requiere" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Creando árbol de dependencias" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versiones candidatas" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Generación de dependencias" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Leyendo la información de estado" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "No se pudo abrir el fichero de estado %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Falló la escritura del fichero de estado temporal %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene " "asociado un valor)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2931,12 +2938,12 @@ msgstr "" "de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más " "información. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2948,12 +2955,12 @@ msgstr "" "generalmente es malo, pero si realmente quiere hacerlo, active la opción |" "APT::Force-LoopBreak»." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "No se da soporte para el tipo de archivo de índice «%s»" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2961,7 +2968,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2969,224 +2976,219 @@ msgstr "" "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directorio de listas %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Falta el directorio de archivos %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "No se pudo bloquear el directorio %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Descargando fichero %li de %li (falta %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Descargando fichero %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "El método %s no se inició correctamente" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "No está soportado el sistema de paquetes «%s»" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "No se pudo leer %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe poner algunos URIs fuente («source») en su sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No se pudieron analizar o abrir las listas de paquetes o el archivo de " "estado." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Tal vez quiera ejecutar «apt-get update» para corregir estos problemas" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Registro inválido en el archivo de preferencias %s, no hay cabecera «Package»" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "No se entiende el pin tipo %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "La caché tiene una versión incompatible de sistema de versiones" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Se produjo un error mientras se procesaba %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vaya, excedió el número de nombres de paquetes que este APT es capaz de " "manejar." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Vaya, excedió el número de descripciones que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedió el número de dependencias que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontró el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "falló el cambio de nombre, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "La suma hash difiere" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "El tamaño difiere" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operación inválida: %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3197,12 +3199,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3212,12 +3214,12 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3225,67 +3227,67 @@ msgstr "" "Los archivos de índice de paquetes están dañados. No existe un campo " "«Filename:» para el paquete %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "No se encontraron secciones en el archivo «Release» %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "No existe una entrada «Hash» en el archivo «Release» %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Entrada «Date» inválida en el archivo «Release» %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Bloque de fabricante %s sin huella digital" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando el CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificando... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Etiqueta guardada: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando el CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Buscando en el disco archivos de índices...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3294,7 +3296,7 @@ msgstr "" "Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices " "de traducción y %zu firmas\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3302,16 +3304,16 @@ msgstr "" "No pude localizar ningún archivo de paquete, ¿quizás este no sea un disco de " "Debian o sea de otra arquitectura?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Se encontró la etiqueta: «%s»\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3320,34 +3322,34 @@ msgstr "" "Este disco se llama: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i registros escritos con %i fichero de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i registros escritos con %i fichero mal emparejado\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3363,39 +3365,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución «%s» para «%s»" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión «%s» para «%s»" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "No se pudo encontrar la tarea «%s»" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3404,57 +3406,57 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "No se puede seleccionar una versión instalada del paquete «%s» puesto que no " "está instalado" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Ejecutando dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3463,120 +3465,120 @@ msgstr "" "No se han podido descargar algunos archivos de índice, se han ignorado, o se " "ha utilizado unos antiguos en su lugar." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Borrando completamente %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Se detectó la desaparición de %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Ejecutando disparador post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Falta el directorio «%s»." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Se borró completamente %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No se puede escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de " "«MaxReports»" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - dejando sin instalar" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3584,7 +3586,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que es " "un mensaje de error asociado a un fallo previo." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3592,7 +3594,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3600,7 +3602,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica un " "error de memoria excedida" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3609,14 +3611,14 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica un " "error de E/S de dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3625,14 +3627,14 @@ msgstr "" "No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún " "otro proceso utilizándolo?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "No se encontró un archivo de réplica «%s»" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3640,7 +3642,7 @@ msgstr "" "se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para " "corregir el problema" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "No bloqueado" diff --git a/po/eu.po b/po/eu.po index a3a81bd6c..5a812f8b2 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -18,157 +18,157 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Pakete Izenak Guztira : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Pakete Izenak Guztira : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Pakete normalak:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Pakete birtual puruak:" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Bakanako pakete birtualak: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Nahastutako pakete birtualak: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Falta direnak: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Bertsio Ezberdinak Guztira: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Azalpen Ezberdinak Guztira: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Dependentziak Guztira: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Guztira Bertsio/fitxategi erlazioak: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Fitx/Azalpen erlazioak guztira: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Guztira Saltzaile Mapatzea: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Guztira bateratutako kateak: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Guztira bertsio dependentzia lekua: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Guztira galdutako tokia:" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Guztira erregistratutako lekua: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "%s pakete fitxategia ez dago sinkronizatuta." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Ez da paketerik aurkitu" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "Zehazki eredu bat eman behar duzu." -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Pakete Fitxategiak:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " "pakete fitxategi bati" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pin duten Paketeak:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(ez da aurkitu)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalatuta: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Hautagaia: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(bat ere ez)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Paketearen pin-a:" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Bertsio taula:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -240,30 +240,30 @@ msgstr "" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Mesedez sar diska bat gailuan eta enter sakatu" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu." @@ -299,65 +299,65 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" @@ -377,97 +377,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -475,7 +475,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -483,14 +483,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -499,7 +499,7 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -507,30 +507,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -617,7 +617,7 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" @@ -626,7 +626,7 @@ msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -639,53 +639,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "baina ez dago instalatuta" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Huts egin du %s irekitzean" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -712,7 +712,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -761,52 +761,52 @@ msgstr "" msgid "Disk not found." msgstr "Ez da diska aurkitu" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Sartzen" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Ezin izan da peer edo parekoaren izena zehaztu" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Ezin izan da izen lokala zehaztu" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -814,124 +814,126 @@ msgstr "" "Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::" "ProxyLogin hutsik dago." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan " "du: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Konexioa denboraz kanpo" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Irakurketa errorea" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Erantzun batek bufferrari gainez eragin dio." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Idazketa errorea" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Ezin izan da socket-a sortu" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Huts egin du" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Ezin izan da socket pasibora konektatu." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Ezin izan da socket bat lotu" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Ezin izan da socket-ean entzun" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Ezin izan da socket-aren izena zehaztu" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Ezin da PORT komandoa bidali" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Helbide familia ezezagunaa: %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Datu-socket konexioak denbora muga gainditu du" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Datu-socketak denbora muga gainditu du" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Kontsulta" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Ezin da deitu " @@ -968,7 +970,7 @@ msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." @@ -998,37 +1000,37 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1036,95 +1038,95 @@ msgstr "" "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " "eskuragarri:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du." -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Barne errorea" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Hau bitxia... Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " @@ -1132,52 +1134,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1188,19 +1190,19 @@ msgstr "" "Jarraitzeko, idatzi '%s' esaldia\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Abortatu." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Aurrera jarraitu nahi al duzu?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1208,19 +1210,19 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1230,15 +1232,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1256,15 +1258,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1278,7 +1280,7 @@ msgstr[1] "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1290,18 +1292,18 @@ msgstr[1] "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "'apt-get autoremove' erabili ezabatzeko." msgstr[1] "'apt-get autoremove' erabili ezabatzeko." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1309,7 +1311,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1321,145 +1323,145 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Paketeak egiaztapen gabe instalatu?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " edo" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1467,27 +1469,27 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" @@ -1496,7 +1498,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[B/e]" @@ -1504,91 +1506,91 @@ msgstr "[B/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[b/E]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " : huts egin du." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Ezin da bertsio berritzeko multzoa minimizatu" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Eginda" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Eginda" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1596,43 +1598,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Atzituta " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Hartu:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ez ikusi " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Lortuta: %sB (%s) (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Lanean]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1645,19 +1647,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Ezin da %s(e)ra aldatu" @@ -1686,11 +1688,11 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" @@ -1732,7 +1734,7 @@ msgstr "" msgid "Merging available information" msgstr "Eskuragarrien datuak biltzen" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1756,40 +1758,40 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Pakete luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Errorea direktorioa prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Iturburu luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Errorea eduki fitxategiaren goiburua idaztean" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Errorea edukiak prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1868,26 +1870,26 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Ez dago bat datorren hautapenik" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1896,192 +1898,192 @@ msgstr "" "DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " "mesedez datubasea ezabatu eta birsortu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ezin da ireki %s datu-base fitxategia: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Artxiboak ez du kontrol erregistrorik" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Ezin da %s direktorioa irakurri\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Ezin da %s atzitu\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Erroreak fitxategiari dagozkio " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Huts egin du %s ebaztean" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Huts egin dute zuhaitz-urratsek" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Huts egin du %s irekitzean" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Huts egin du %s esteka irakurtzean" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Huts egin du %s desestekatzean" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Ezin izan da %s %s(r)ekin estekatu" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Huts egin du memoria esleitzean" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ezin da %s ireki" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Huts egin du %s override fitxategia irakurtzean" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gaizki osatutako override %s, lerroa: %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' Konpresio Algoritmo Ezezaguna" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s irteera konprimituak konpresio-tresna bat behar du" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Huts egin du FILE* sortzean" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Huts egin du sardetzean" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Konprimatu Umeak" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Barne Errorea, Huts %s sortzerakoan" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Huts egin du MD5 konputatzean" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2134,157 +2136,157 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Huts egin du kanalizazioak sortzean" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Huts egin du gzip exekutatzean " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Hondatutako artxiboa" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "%u TAR goiburu mota ezezaguna, %s kidea" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Artxibo sinadura baliogabea" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Errorea artxiboko kidearen goiburua irakurtzean" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Artxiboko kidearen goiburua baliogabea da" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Artxiboko kidearen goiburua baliogabea da" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Artxiboa laburregia da" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Huts egin artxibo goiburuak irakurtzean" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Huts egin du hash-elementua lokalizatzean!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Huts egin du desbideratzea lokalizatzean" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion-n barne errorea" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "%s bidea luzeegia da" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s behin baino gehiagotan deskonprimitzen" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "%s direktorioa desbideratuta dago" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Desbideratzearen bidea luzeegia da" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Bidea luzeegia da" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Ezin da daturik lortu %s(e)tik" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Barne Errorea, ezin da %s atala kokatu" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Kontrol fitxategi ezin analizagarria" @@ -2343,498 +2345,503 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Mota ezezaguneko laburtzapena: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurazio fitxategia irekitzen" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Sintaxi errorea %s:%u: Gaizki eratutako" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errorea!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Eginda" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Eginda" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Ez da ulertzen komando lerroko %s aukera" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Komando lerroko %s aukera ez da boolearra." -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "%s aukerak argumentu bat behar du." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "'%s' aukera luzeegia da" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ezin da atzitu %s muntatze puntua" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Arazoa fitxategia ixtean" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Arazoa fitxategia ixtean" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Ezin izan da %s(r)en kanalizazioa ireki" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Huts egin du IPC azpiprozesua sortzean" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Huts egin du konpresorea exekutatzean " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Abortatu instalazioa." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Paketeen katxea hutsik" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Paketeen katxe fitxategia hondatuta dago" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Paketeen katxe fitxategia hondatuta dago" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT honek ez du '%s' bertsio sistema onartzen" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Mendekotasuna:" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Aurremendekotasuna:" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Iradokizuna:" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Gomendioa:" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Gatazka:" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Ordeztea:" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Zaharkitzea:" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Apurturik" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "garrantzitsua" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "beharrezkoa" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "estandarra" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "aukerakoa" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "estra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Dependentzia zuhaitza eraikitzen" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Hautagaien bertsioak" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Dependentzi Sormena" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Egoera argibideak irakurtzen" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Huts egin du %s EgoeraFitxategia irekitzean" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2846,19 +2853,19 @@ msgstr "" "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " "aukera." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "'%s' motako indize fitxategirik ez da onartzen" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2866,213 +2873,208 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "%spartial zerrenda-direktorioa falta da." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "%spartial artxibo direktorioa falta da." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Ezin da zerrenda direktorioa blokeatu" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "%li fitxategia jasotzen %li-tik" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete sistema ez da onartzen" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete sistemaren mota egokirik zehaztu" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Ezin da %s atzitu." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Ezin izan da Iturburu zerrenda irakurri." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Ez da ulertu %s orratz-mota (pin)" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Katxearen bertsio sistema ez da bateragarria" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Tamaina ez dator bat" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3080,12 +3082,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3094,12 +3096,12 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3107,67 +3109,67 @@ msgstr "" "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Lerro baliogabea desbideratze fitxategian: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "%s saltzaile blokeak ez du egiaztapen markarik" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM Desmuntatzen...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Egiaztatzen... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Gordetako Etiketa: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM Desmuntatzen...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Indize fitxategien bila diska arakatzen...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3176,22 +3178,22 @@ msgstr "" "%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura " "aurkitu dira\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Aurkitutako Etiketa: '%s' \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Hau ez baliozko izen bat, froga berriro.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3200,34 +3202,34 @@ msgstr "" "Diskaren izen:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3243,88 +3245,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, 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:482 +#: apt-pkg/cacheset.cc:490 #, 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:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ezin izan da %s zeregina aurkitu" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3333,167 +3335,167 @@ msgstr "" "Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s Instalatzen" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s kentzen" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "'%s' direktorioa falta da" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s : ezin da idatzi" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Ezin da zerrenda direktorioa blokeatu" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/fi.po b/po/fi.po index 11c765edf..b0315c754 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -18,155 +18,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Pakettien kokonaismäärä : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Pakettien kokonaismäärä : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Tavallisia paketteja: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Aitoja näennäispaketteja: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Yksinkertaisia näennäispaketteja: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Sekanäennäispaketteja: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Puuttuu: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Eri versioita yhteensä: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Eri kuvauksia yhteensä: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Riippuvuuksia yhteensä: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Versio/tdsto suhteita yht: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Kuvaus/tdsto suhteita yht: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Tarjoamiskuvauksia yhteensä: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Erilaisia merkkijonoja yhteensä: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Versioriippuvuustila yhteensä: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Löysää tilaa yhteensä: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Käytetty tila yhteensä: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Pakettitiedosto %s ei ole ajan tasalla." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "On annettava täsmälleen yksi lauseke" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Pakettitiedostot:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Paketit joissa tunniste:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(ei löydy)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Asennettu: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Ehdokas: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ei mitään)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Paketin tunnistenumero: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -238,29 +238,29 @@ msgstr "" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" "Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\"" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Aseta levy asemaan ja paina Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Toista tämä lopuille rompuille kasassasi." @@ -296,65 +296,65 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" @@ -374,96 +374,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -471,7 +471,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -479,14 +479,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,7 +495,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -503,30 +503,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -612,7 +612,7 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" @@ -621,7 +621,7 @@ msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -634,53 +634,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "mutta ei ole asennettu" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -707,7 +707,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -755,52 +755,52 @@ msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." msgid "Disk not found." msgstr "Levyä ei löydy" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Kirjaudutaan sisään" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Vastapään nimeä ei saa selville" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Paikallista nimeä ei saa selville" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Palvelin ei huolinut yhteyttä ilmoituksella: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER ei onnistunut, palvelimen ilmoitus: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ei onnistunut, palvelimen ilmoitus: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -808,121 +808,123 @@ msgstr "" "Määritettiin välipalvelin mutta ei komentotiedostoa kirjautumiseen, Acquire::" "ftp::ProxyLogin on tyhjä." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Yhteys aikakatkaistiin" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Lukuvirhe" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Vastaus aiheutti puskurin ylivuodon." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Virhe kirjoitettaessa" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Pistoketta ei voitu luoda" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Ei onnistunut" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Passiivista pistoketta ei voitu kytkeä." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ei saanut kuuntelupistoketta" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Pistoketta ei voitu nimetä" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Pistoketta ei voitu kuunnella" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Pistokkeen nimeä ei saatu selville" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Komennon PORT lähetys ei onnistu" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Tuntematon osoiteperhe %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Pistokkeen kytkeminen aikakatkaistiin" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\"" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Pistoke aikakatkaistiin" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\"" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Kysely" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" @@ -958,7 +960,7 @@ msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" @@ -988,39 +990,39 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" msgid "Unable to connect to %s:%s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1028,148 +1030,148 @@ msgstr "" "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole " "saatavilla:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Sisäinen virhe" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1180,19 +1182,19 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Keskeytä." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Haluatko jatkaa?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1200,19 +1202,19 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " "kokeile --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1222,16 +1224,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1249,15 +1251,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Sisäinen virhe, AutoRemover rikkoi jotain" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1271,7 +1273,7 @@ msgstr[1] "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1283,18 +1285,18 @@ msgstr[1] "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Poista ne komennolla \"apt-get autoremove\"." msgstr[1] "Poista ne komennolla \"apt-get autoremove\"." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1302,7 +1304,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1313,145 +1315,145 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Varoitus varmistamisesta on ohitettu.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Asennetaanko nämä paketit ilman todennusta?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " tai" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1459,27 +1461,27 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" @@ -1488,7 +1490,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[K/e]" @@ -1496,91 +1498,91 @@ msgstr "[K/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "K" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " ei onnistunut." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Valmis" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Valmis" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1588,43 +1590,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Löytyi " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Nouda:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Siv " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Vrhe " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Noudettiin %st ajassa %s (%st/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Työskennellään]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1637,19 +1639,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Kansioon %s vaihto ei onnistu" @@ -1678,11 +1680,11 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" @@ -1725,7 +1727,7 @@ msgstr "" msgid "Merging available information" msgstr "Yhdistetään saatavuustiedot" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1749,41 +1751,41 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Paketin laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Tapahtui virhe käsiteltäessa kansiota %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lähteiden laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "" "Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1865,26 +1867,26 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Mitkään valinnat eivät täsmänneet" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Tietokanta on vanha, yritetään päivittää %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1893,192 +1895,192 @@ msgstr "" "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " "on tietokanta poistettava ja luotava uudelleen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arkistolla ei ole ohjaustietuetta" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kansiota %s ei voi lukea\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Tdstolle %s ei toimi stat\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Tiedostossa virheitä " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Osoitteen %s selvitys ei onnistunut" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Puun läpikäynti ei onnistunut" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "readlink %s ei onnistunut" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "unlink %s ei onnistunut" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linkin %s -> %s luonti ei onnistunut" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Muistin varaaminen ei onnistunut" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Tuntematon pakkausalgoritmi \"%s\"" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "FILE* luominen ei onnistunut" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "fork ei onnistunut" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Compress-lapsiprosessi" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2131,157 +2133,157 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Putkien luonti ei onnistunut" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "exec gzip ei onnistunut" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Arkiston tarkistussumma on virheellinen" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Arkiston tiedoston otsikko on virheellinen" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Arkiston tiedoston otsikko on virheellinen" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arkisto on pienempi kuin pitäisi" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Arkiston otsikoiden luku ei onnistunut" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Hajautusalkiota ei löytynyt!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Korvautuksen varaus ei onnistunut" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion: sisäinen virhe" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Korvautuksen kaksoislisäys %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Polku %s on liian pitkä" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Purettiin %s useammin kuin kerran" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Kansio %s on korvautunut" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Korvautuspolku on liian pitkä" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Solmua ei löytynyt sen hajautuslokerosta" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Polku on liian pitkä" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\"" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Ohjaustiedosto ei jäsenny" @@ -2338,494 +2340,499 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tuntematon tyypin lyhenne: \"%c\"" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Avataan asetustiedosto %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Virhe!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Valmis" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Valmis" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Komentorivin valitsin %s on tuntematon" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Komentorivin valitsin %s ei ole totuusarvoinen" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Valitsin %s tarvitsee parametrin" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =<arvo>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\"" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Valitsin \"%s\" on liian pitkä" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Virheellinen toiminto %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Pulmia tiedoston sulkemisessa" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Pulmia tiedoston sulkemisessa" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Putkea %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Pakkaajan käynnistäminen ei onnistunut" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Asennus keskeytetään." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Pakettivarasto on tyhjä" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Pakettivarasto on turmeltunut" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Pakettivaraston versio on yhteensopimaton" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Pakettivarasto on turmeltunut" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\"" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Pakettivarasto on tehty muulle arkkitehtuurille" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Riippuvuudet" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Esiriippuvuudet" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Ehdotukset" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Suosittelut" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Ristiriidat" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Korvaavuudet" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Täydet korvaavuudet" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Rikkoo" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "tärkeä" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "välttämätön" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "perus" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "valinnainen" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ylimääräinen" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Mahdolliset versiot" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Luetaan tilatiedot" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Tilatiedoston %s avaaminen ei onnistunut" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2836,18 +2843,18 @@ msgstr "" "%s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, " "mutta jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2855,215 +2862,210 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Luettelokansio %spartial puuttuu." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Arkistokansio %spartial puuttuu." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Luettelokansiota ei voitu lukita" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Noudetaan tiedosto %li / %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Menetelmän ajuria %s ei löytynyt" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "stat %s ei onnistu." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Tunnistetyyppi %s on tuntematon" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Tarkistussumma ei täsmää" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Koko ei täsmää" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Virheellinen toiminto %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3071,12 +3073,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3085,12 +3087,12 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3098,67 +3100,67 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Huomautus, valitaan %s eikä %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Virheellinen rivi korvautustiedostossa: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Irrotetaan romppu...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Tunnistetaan... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Tallennettu nimio: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Irrotetaan romppu...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3167,22 +3169,22 @@ msgstr "" "Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, " "käännösten %zu ja allekirjoituksia löytyi %zu\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Löytyi nimiö: \"%s\"\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3191,34 +3193,34 @@ msgstr "" "Tämä levy on: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3235,88 +3237,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Kohteen %s tarkistussumma ei täsmää" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Tehtävää %s ei löytynyt" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Pakettia %s ei löytynyt" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Pakettia %s ei löytynyt" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3325,167 +3327,167 @@ msgstr "" "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Asennetaan %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Suoritetaan jälkiasennusliipaisin %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Kansio \"%s\" puuttuu." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Luettelokansiota ei voitu lukita" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/fr.po b/po/fr.po index f5a93f9c9..6ce872047 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,153 +19,153 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n > 1;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Le paquet %s de version %s contient une dépendance absente :\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Nombre total de paquets : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Nombre total de structures de paquets : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Paquets ordinaires : " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Paquets entièrement virtuels : " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Paquets virtuels simples : " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Paquets virtuels mixtes : " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Manquants : " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Nombre de versions distinctes : " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Nombre de descriptions distinctes : " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Nombre de dépendances : " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Nombre de relations version/fichier : " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Nombre de relations description/fichier : " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Nombre de relations « Provides » : " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Nombre de motifs rationnels : " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Espace occupé par les versions des dépendances : " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Espace disque gaspillé : " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Total de l'espace attribué : " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Fichier %s désynchronisé." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Aucun paquet n'a été trouvé" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Vous devez fournir au moins un motif de recherche" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Fichiers du paquet :" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Le cache est désynchronisé, impossible de référencer un fichier" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Paquets épinglés :" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(non trouvé)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Installé : " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidat : " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(aucun)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Épinglage de paquet : " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Table de version :" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -239,34 +239,35 @@ msgstr "" "plus\n" "d'informations.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" -"Aucun CD n'a été détecté sur le point de montage par défaut.\n" -"Vous pouvez utiliser l'option --cdrom pour indiquer le point de montage du " -"CD-ROM. Voir la page de manuel d'apt-cdrom pour plus d'informations sur " -"l'auto-détection des CD et le point de montage." - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Veuillez indiquer le nom de ce disque, par exemple « Debian 5.0.3 Disk 1 »" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "" "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Impossible de monter « %s » sur « %s »" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +#, fuzzy +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" +"Aucun CD n'a été détecté sur le point de montage par défaut.\n" +"Vous pouvez utiliser l'option --cdrom pour indiquer le point de montage du " +"CD-ROM. Voir la page de manuel d'apt-cdrom pour plus d'informations sur " +"l'auto-détection des CD et le point de montage." + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Veuillez répéter cette opération pour tous les disques de votre jeu de " @@ -304,53 +305,53 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "" "Impossible de trouver de paquet correspondant à l'expression rationnelle " "« %s »" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "" "Impossible de trouver de paquet correspondant à l'expression rationnelle " "« %s »" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "" "Impossible de trouver de paquet correspondant à l'expression rationnelle " "« %s »" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Choix de « %s » comme paquet source à la place de « %s »\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "La version « %s » indisponible du paquet « %s » est ignorée" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s passé en « installé automatiquement ».\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -358,21 +359,21 @@ msgstr "" "Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-" "mark manual »." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" @@ -399,80 +400,80 @@ msgstr "" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -482,17 +483,17 @@ msgstr "" "consulter la section à propos de APT::Architectures dans la page de manuel " "apt.conf(5)." -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -501,7 +502,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " "autorisé avec les paquets « %s »." -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -510,14 +511,14 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -526,7 +527,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "disponible du paquet %s ne peut satisfaire les prérequis de version." -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -535,31 +536,31 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s " "n'a pas de version disponible." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -649,7 +650,7 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'options.\n" " Cet APT a les « Super Cow Powers »\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Vous devez spécifier au moins un paquet source" @@ -658,7 +659,7 @@ msgstr "Vous devez spécifier au moins un paquet source" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -671,55 +672,55 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s ne peut pas être marqué car il n'est pas installé.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s était déjà marqué comme installé manuellement.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s était déjà marqué comme installé automatiquement.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s était déjà marqué comme figé (« hold »).\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s était déjà marqué comme non figé.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s passé en figé (« hold »).\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Annulation de l'état figé pour %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" "Échec de l'exécution de dpkg. Possédez-vous les privilèges du " "superutilisateur ?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -769,7 +770,7 @@ msgstr "" "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n" "pour plus d'informations." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -819,52 +820,52 @@ msgstr "" msgid "Disk not found." msgstr "Disque non trouvé." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Fichier non trouvé" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Connexion en cours" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Impossible de déterminer le nom de la machine distante" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Impossible de déterminer le nom local" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Le serveur a refusé notre connexion et a répondu : %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -872,123 +873,125 @@ msgstr "" "Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::" "ftp::ProxyLogin est vide." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Échec de TYPE, le serveur a répondu : %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Dépassement du délai de connexion" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Erreur de lecture" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Une réponse a fait déborder le tampon." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Erreur d'écriture" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Impossible de créer un connecteur" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Impossible de se connecter sur le port de données, délai de connexion dépassé" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Échec" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Impossible de se connecter au port en mode passif." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo n'a pu obtenir un port d'écoute" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Impossible de se connecter à un port" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Impossible d'écouter sur le port" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Impossible de déterminer le nom du port" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Impossible d'envoyer la commande PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famille d'adresses %u inconnue (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Délai de connexion au port de données dépassé" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Pas de réponse du port données dans les délais" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Le transfert de données a échoué, le serveur a répondu « %s »" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Requête" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Impossible d'invoquer " @@ -1024,7 +1027,7 @@ msgstr "Connexion à %s: %s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" @@ -1056,25 +1059,25 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez " "vérifier si gpgv est installé)." #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1083,15 +1086,15 @@ msgstr "" "Le fichier signé en clair n'est pas valable, ce qui a été reçu est « %s ». " "Peut-être le réseau nécessite-t-il une authentification." -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1099,96 +1102,96 @@ msgstr "" "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " "n'est pas disponible :\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tête" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tête" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possède un support des limites non-valide" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Erreur interne" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" "Les paquets doivent être enlevés mais la désinstallation est désactivée." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " @@ -1196,21 +1199,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est nécessaire de prendre %so dans les archives.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1218,21 +1221,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " @@ -1242,11 +1245,11 @@ msgstr "" # sentence is supposed to be typed by a user who cannot see the difference. #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis !" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1257,19 +1260,19 @@ msgstr "" "Pour continuer, tapez la phrase « %s »\n" " ?]" -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Annulation." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Souhaitez-vous continuer ?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1277,20 +1280,20 @@ msgstr "" "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Annulation de l'installation." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1304,18 +1307,18 @@ msgstr[1] "" "Les paquets suivants ont disparu du système car tous leurs fichiers\n" "ont été remplacés par d'autres paquets :" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" "Note : cette opération volontaire (effectuée par dpkg) est automatique." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Aucune suppression n'est censée se produire : impossible de lancer " "« Autoremover »" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1334,16 +1337,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Erreur interne, l'outil de suppression automatique a cassé quelque chose." -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1355,7 +1358,7 @@ msgstr[1] "" "Les paquets suivants ont été installés automatiquement et ne sont plus " "nécessaires :" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1365,18 +1368,18 @@ msgstr[0] "" msgstr[1] "" "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer." msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1384,7 +1387,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1396,145 +1399,145 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Paquets défectueux" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignoré.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu être authentifiés" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Faut-il installer ces paquets sans vérification ?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installé]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Installé]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Installé]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Installé]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1543,27 +1546,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" @@ -1572,7 +1575,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[O/n]" @@ -1580,91 +1583,91 @@ msgstr "[O/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[o/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Correction des dépendances..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " a échoué." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dépendances" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis à jour" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Fait" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas de paramètre" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Fait" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1678,43 +1681,43 @@ msgstr "" " et la situation n'est donc pas forcément représentative\n" " de la réalité !" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Impossible de changer le nom %s en %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Atteint " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Réception de : " -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%so réceptionnés en %s (%so/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [En cours]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1727,19 +1730,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accéder à %s" @@ -1768,11 +1771,11 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." msgid "[Mirror: %s]" msgstr "[Miroir : %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de créer le tube IPC sur le sous-processus" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" @@ -1815,7 +1818,7 @@ msgstr "" msgid "Merging available information" msgstr "Fusion des informations disponibles" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1839,41 +1842,41 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'écrire sur %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "La liste d'extension du paquet est trop longue" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Erreur lors du traitement du répertoire %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "La liste d'extension des sources est trop grande" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Erreur du traitement du contenu %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1956,27 +1959,27 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Aucune sélection ne correspond" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Base de données corrompue, fichier renommé en %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Base de données ancienne, tentative de mise à jour de %s\"" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1984,192 +1987,192 @@ msgstr "" "Le format de la base de données n'est pas valable. Si vous mettez APT à " "jour, veuillez supprimer puis recréer la base de données." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Impossible de statuer %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "L'archive n'a pas d'enregistrement de contrôle" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Impossible d'obtenir un curseur" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A : Impossible de lire le contenu du répertoire %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A : Impossible de statuer %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E : " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A : " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E : des erreurs sont survenues sur le fichier " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Impossible de résoudre %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Échec du parcours de l'arbre" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Délier %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Impossible de lire le lien %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Impossible de délier %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossible de lier %s à %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "L'archive ne possède pas de champ de paquet" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possède pas d'entrée « override »\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s ne possède pas d'entrée « source override »\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ne possède pas également pas d'entrée « binary override »\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Échec de l'allocation de mémoire" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossible d'ouvrir %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Entrée « override » %s mal formée ligne %llu n° 1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Impossible de lire le fichier d'« override » %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Entrée « override » %s mal formée ligne %llu n° 1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Entrée « override » %s mal formée %llu n° 2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Entrée « override » %s mal formée %llu n° 3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorithme de compression « %s » inconnu" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La sortie compressée %s a besoin d'un ensemble de compression" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Impossible de créer FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Échec du fork" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Fils compressé" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Erreur interne, impossible de créer %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Impossible de lire lors du calcul de la somme MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problème en déliant %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2225,157 +2228,157 @@ msgstr "" " -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Échec de création de tubes" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Impossible d'exécuter gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Type d'en-tête %u inconnu pour TAR, partie %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Signature d'archive invalide" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Erreur de lecture de l'en-tête du membre d'archive" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "En-tête du membre d'archive %s non valable" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "En-tête du membre d'archive non-valable" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "L'archive est trop petite" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Échec de la lecture des en-têtes d'archive" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode appelé sur un nœud toujours lié" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Impossible de situer l'élément haché !" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Échec lors de l'allocation de la déviation" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erreur interne dans AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Addition double d'une déviation %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fichier de configuration en double %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Erreur d'écriture du fichier %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Échec de clôture du fichier %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Le chemin %s est trop long" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Veuillez décompresser %s plus d'une fois" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Le répertoire %s est détourné" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Le chemin de déviation est trop long" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Le répertoire %s va être remplacé par un non-répertoire" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Échec pour localiser le nœud dans la table de hachage" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Le chemin est trop long" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Écrase la correspondance de paquet sans version pour %s " -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Impossible de statuer pour %s." -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erreur interne, ne peut localiser la partie %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Fichier de contrôle non traitable" @@ -2437,215 +2440,210 @@ msgstr "" "automatique a été désactivée par une option utilisateur." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "La sélection %s n'a pu être trouvée" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Type d'abréviation non reconnue : « %c »" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Ouverture du fichier de configuration %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erreur syntaxique %s:%u : balise mal formée" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au " "niveau le plus haut" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre " "d'options comme paramètre" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erreur !" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fait" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "…" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s… %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "L'option %s de la ligne de commande n'est pas reconnue" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "L'option %s nécessite un paramètre." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "L'option %s prend un nombre entier en paramètre, et non « %s »" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "L'option « %s » est trop longue" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "La signification %s n'est pas comprise, veuillez essayer vrai ou faux." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "L'opération %s n'est pas valable" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Impossible d'accéder au cédérom." -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problème de fermeture du fichier gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Verrou non utilisé pour le fichier %s en lecture seule" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Impossible d'obtenir le verrou %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "La liste des fichiers ne peut pas être créée car « %s » n'est pas un " "répertoire" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier " "ordinaire" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas " "d'extension" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2653,289 +2651,299 @@ msgstr "" "« %s » dans le répertoire « %s » a été ignoré car il utilise une extension " "non valable" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Le sous-processus %s a commis une violation d'accès mémoire" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Le sous-processus %s a reçu le signal %u" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problème de fermeture du fichier gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Impossible d'ouvrir le fichier %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Impossible d'ouvrir le descripteur de fichier %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Impossible de créer un sous-processus IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Impossible d'exécuter la compression " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "impossible de changer le nom, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Pas de porte-clés installé dans %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Cache des paquets vide" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Le fichier de cache des paquets est corrompu" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Le fichier de cache des paquets a une version incompatible" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Le fichier de cache des paquets est corrompu, il est trop petit." -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Cet APT ne supporte pas le système de version « %s »" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Le cache des paquets a été construit pour une architecture différente" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Dépend" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Pré-Dépend" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Suggère" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recommande" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Est en conflit avec" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Remplace" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Rend obsolète" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Casse" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Améliore" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "nécessaire" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "optionnel" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "supplémentaire" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Construction de l'arbre des dépendances" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versions possibles" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Génération des dépendances" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Lecture des informations d'état" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Impossible d'ouvrir le fichier d'état %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Erreur d'écriture du fichier d'état temporaire %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser " "[option])" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une " "affectation)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de " "valeur)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2945,12 +2953,12 @@ msgstr "" "consulter la page de manuel apt.conf(5) et notamment la section à propos de " "APT::Immediate-Configure, pour plus d'informations. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Impossible de configurer « %s »." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2962,12 +2970,12 @@ msgstr "" "Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement " "le faire, activez l'option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Le type de fichier d'index « %s » n'est pas accepté" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2975,7 +2983,7 @@ msgstr "" "Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2983,95 +2991,95 @@ msgstr "" "Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé " "par les paquets devant être gardés en l'état." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Le répertoire %spartial pour les listes n'existe pas." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Le répertoire d'archive %spartial n'existe pas." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Impossible de verrouiller le répertoire %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Téléchargement du fichier %li sur %li (%s restant)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Téléchargement du fichier %li sur %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, 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:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " "touche Entrée." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le système de paquet « %s » n'est pas supporté" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de déterminer un type du système de paquets adéquat" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Impossible de localiser %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Vous devez insérer quelques adresses « sources » dans votre sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Les listes de paquets ou le fichier « status » ne peuvent être analysés ou " "lus." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3080,110 +3088,105 @@ msgstr "" "La valeur « %s » n'est pas valable pour APT::Default-Release car cette " "version ne fait pas partie des sources disponibles." -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Enregistrement non valable dans le fichier de préférences %s, aucune entrée " "« Package »." -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Type d'épinglage %s inconnu" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Le cache possède un système de version incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Erreur apparue lors du traitement de %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vous avez dépassé le nombre de noms de paquets que cette version d'APT est " "capable de traiter." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Vous avez dépassé le nombre de versions que cette version d'APT est capable " "de traiter." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Vous avez dépassé le nombre de descriptions que cette version d'APT est " "capable de traiter." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vous avez dépassé le nombre de dépendances que cette version d'APT est " "capable de traiter." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " "fichiers" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Lecture des listes de paquets" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Assemblage des fichiers listés dans les champs Provides" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "" "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "impossible de changer le nom, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Taille incohérente" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "L'opération %s n'est pas valable" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3192,18 +3195,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3212,12 +3215,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3228,12 +3231,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3242,14 +3245,14 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3257,67 +3260,67 @@ msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Impossible d'analyser le fichier Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Pas de sections dans le fichier Release %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Pas d'entrée de hachage dans le fichier Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Entrée « Date » non valable dans le fichier Release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cédérom\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Démontage du cédérom...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montage du cédérom...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identification..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Étiquette stockée : %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Démontage du cédérom...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Examen du disque à la recherche de fichiers d'index...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3326,7 +3329,7 @@ msgstr "" "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions " "et %zu signatures\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3334,16 +3337,16 @@ msgstr "" "Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian " "ou bien l'architecture est-elle incorrecte." -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Étiquette « %s » trouvée\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3352,34 +3355,34 @@ msgstr "" "Ce disque s'appelle :\n" "« %s »\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Écriture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements écrits.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3396,43 +3399,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, 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:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossible de trouver la tâche « %s »" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3441,56 +3444,56 @@ msgstr "" "Impossible de choisir une version installée ou candidate du paquet « %s » " "qui n'en n'a aucune" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Impossible de choisir la version installée du paquet « %s » qui n'est pas " "installé" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Envoi du scénario au solveur" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Envoi d'une requête au solveur" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Préparation à la réception de la solution" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Échec du solveur externe sans message d'erreur adapté" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Exécu tion du solveur externe" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Exécution de dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3498,118 +3501,118 @@ msgstr "" "Le téléchargement de quelques fichiers d'index a échoué, ils ont été " "ignorés, ou les anciens ont été utilisés à la place." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Installation de %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Disparition de %s constatée" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Exécution des actions différées (« trigger ») de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Répertoire %s inexistant" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Impossible d'ouvrir le fichier « %s »" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossible d'écrire sur %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3617,14 +3620,14 @@ msgstr "" "Aucun rapport « apport » n'a été créé car le message d'erreur indique une " "erreur consécutive à un échec précédent." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3632,7 +3635,7 @@ msgstr "" "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3640,14 +3643,14 @@ msgid "" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Aucun « apport » n'a été créé car une erreur d'entrée/sortie de dpkg a été " "signalée" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3656,7 +3659,7 @@ msgstr "" "Impossible de verrouiller le répertoire d'administration (%s). Il est " "possible qu'un autre processus l'utilise." -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3665,7 +3668,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3673,7 +3676,7 @@ msgstr "" "dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le " "problème." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Non verrouillé" diff --git a/po/gl.po b/po/gl.po index 273347481..4a18059f1 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -22,155 +22,155 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Galician\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Número total de nomes de paquetes : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Estruturas de paquetes totais: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Paquetes normais: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Paquetes virtuais puros: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Paquetes virtuais simples: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Paquetes virtuais mixtos: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Non atopados: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Número total de versións distintas: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Número total de descricións distintas: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Número total de dependencias: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Número total de relacións versión/ficheiro: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Número total de relacións descrición/ficheiro: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Número total de asignacións provistas: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Número total de cadeas: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Espazo total de versións de dependencias: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Espazo de reserva total: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Espazo total contabilizado: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro de paquete %s está sen sincronizar." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Non se atopou ningún paquete" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Debe fornecer cando menos un patrón de busca" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Non foi posíbel atopar o paquete %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Ficheiros de paquetes:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de " "paquetes" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Paquetes inmobilizados:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(non se atopou)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ningún)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Inmobilizado: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -244,28 +244,28 @@ msgstr "" "Vexa a páxina de manual apt-cache(8) e apt.conf(5) para obter mais " "información.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Insira un disco na unidade e prema Intro" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Produciuse un fallo ao montar «%s» en «%s»" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para o resto de CD do seu conxunto." @@ -302,65 +302,65 @@ msgstr "" " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Tome «%s» como paquete fonte no canto de «%s»\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Non foi posíbel atopar o paquete %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiado a instalado manualmente.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está estabelecido para a súa instalación automática.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Produciuse un erro interno, o solucionador interno estragou cousas" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Non é posíbel bloquear o directorio de descargas" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" @@ -386,97 +386,97 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ten que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar polo menos un paquete para comprobarlle as dependencias " "de compilación" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non é posíbel obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s " "é novo de máis" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión " "dispoñíbel do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de construción de %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -635,7 +635,7 @@ msgstr "" "para obter mais información e opcións\n" " Este APT ten poderes da Super Vaca.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" @@ -644,7 +644,7 @@ msgstr "Ten que especificar polo menos un paquete para obter o código fonte" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -657,53 +657,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "mais non está instalado" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s cambiado a instalado manualmente.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s está estabelecido para a súa instalación automática.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s cambiado a instalado manualmente.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Non foi posíbel abrir %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -730,7 +730,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -778,52 +778,52 @@ msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda msgid "Disk not found." msgstr "Non se atopou o disco" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI incorrecto, os URI locais non deben comezar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Identificándose" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Non é posíbel determinar o nome do outro extremo" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Non é posíbel determinar o nome local" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor rexeitou a conexión e dixo: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Fallou a orde USER, o servidor dixo: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Fallou a orde PASS, o servidor dixo: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -831,122 +831,124 @@ msgstr "" "Especificouse un servidor proxy pero non un script de conexión, Acquire::" "ftp::ProxyLogin está baleiro." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Fallou a orde TYPE, o servidor dixo: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Esgotouse o tempo para a conexión" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Produciuse un erro de lectura" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Unha resposta desbordou o búfer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Dano no protocolo" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Produciuse un erro de escritura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Non é posíbel crear un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Fallou" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Non é posíbel conectar o socket pasivo." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo non puido obter un socket no que atender" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Non é posíbel ligar un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Non é posíbel escoitar no socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Non é posíbel determinar o nome do socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Non é posíbel enviar a orde PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familia de enderezos %u (AF_*) descoñecida" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "A conexión do socket de datos esgotou o tempo" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Non é posíbel aceptar a conexión" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Xurdiu un problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "O socket de datos esgotou o tempo" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Petición" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Non é posíbel chamar a " @@ -982,7 +984,7 @@ msgstr "Non foi posíbel conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1012,40 +1014,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Non é posíbel conectar %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Atopouse polo menos unha sinatura incorrecta." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Produciuse un erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran correctas:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1053,99 +1055,99 @@ msgstr "" "Non se puideron verificar as seguintes sinaturas porque a chave pública non " "está dispoñíbel:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores válidos" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Produciuse un erro ao escribir no ficheiro" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Produciuse un erro ao ler do servidor" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Produciuse un erro ao escribir nun ficheiro" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Produciuse un erro ao escribir no ficheiro de saída" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Agardando polas cabeceiras" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou unha cabeceira de resposta incorrecta" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "O servidor HTTP enviou unha cabeceira cunha lonxitude de contido incorrecta" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou unha cabeceira cun rango de contido incorrecto" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Formato de datos descoñecido" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Produciuse un fallo na conexión" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Produciuse un erro interno" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Produciuse un erro interno, chamouse a InstallPackages con paquetes " "estragados." -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Hai que retirar paquetes mais o retirado está desactivado." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Produciuse un erro interno; non rematou a ordenación" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que estraño... Os tamaños non coinciden; envíe un correo-e a apt@packages." @@ -1153,52 +1155,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Ten que recibir %sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre abondo en %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Xurdiron problemas e empregouse -y sen --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Si, fai o que digo!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1209,19 +1211,19 @@ msgstr "" "Para continuar escriba a frase «%s»\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Interromper." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Quere continuar?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Non foi posíbel descargar algúns ficheiros" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1229,20 +1231,20 @@ msgstr "" "Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está admitido" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Interrompendo a instalación." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1256,17 +1258,17 @@ msgstr[1] "" "Os seguintes paquetes desapareceron do seu sistema e todos os \n" "ficheiros serán sobrescritos por outros paquetes:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Isto será feito automaticamente por dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non se agarda que eliminemos cousas, non se pode iniciar o Retirado " "automático" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1284,15 +1286,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a solucionar a situación:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Produciuse un erro interno, o Retirado automático estragou cousas" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1304,7 +1306,7 @@ msgstr[1] "" "Os seguintes paquetes foron instalados automaticamente e xa non son " "necesarios:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1313,18 +1315,18 @@ msgstr[0] "%lu paquete foi instalado automaticamente e xa non é necesario.\n" msgstr[1] "" "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Empregue «apt-get autoremove» para eliminalos." msgstr[1] "Empregue «apt-get autoremove» para eliminalos." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pode querer executar «apt-get -f install» para corrixir isto:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1332,7 +1334,7 @@ msgstr "" "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou " "especifique unha solución)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1345,145 +1347,145 @@ msgstr "" "algúns paquetes solicitados aínda non se creasen ou que se movesen da " "entrada." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Paquetes estragados" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Instalaranse os seguintes paquetes extra:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Paquetes suxeridos:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Non se poden autenticar os seguintes paquetes!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Ignórase o aviso de autenticación.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Non foi posíbel autenticar algúns paquetes" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Instalar estes paquetes sen verificación?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "mais non é instalábel" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "mais non está instalado" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1491,27 +1493,27 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" @@ -1520,7 +1522,7 @@ msgstr "%lu non instalados ou retirados de todo.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[S/n]" @@ -1528,91 +1530,91 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Corrixindo as dependencias..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " fallou." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Non foi posíbel corrixir as dependencias." -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Non foi posíbel minimizar o conxunto de anovacións" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Feito" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pode querer executar «apt-get -f install» para corrixilos." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "A orde «update» non toma argumentos" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Calculando a anovación... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Produciuse un erro interno, AllUpgrade estragou cousas" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Feito" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1625,43 +1627,43 @@ msgstr "" " Lembre tamén que o bloqueo está desactivado,\n" " polo que non debe depender da relevancia da situación actual real." -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Non foi posíbel cambiar o nome de %s a %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Teño " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Rcb:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Obtivéronse %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Traballando]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1674,19 +1676,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Non é posíbel ler %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Non é posíbel cambiar a %s" @@ -1715,11 +1717,11 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»" msgid "[Mirror: %s]" msgstr "[Replica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" @@ -1760,7 +1762,7 @@ msgstr "" msgid "Merging available information" msgstr "Mesturando a información sobre paquetes dispoñíbeis" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1785,40 +1787,40 @@ msgstr "" " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Non é posíbel escribir en %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "A lista de extensións de paquetes é longa de máis" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Produciuse un erro ao procesar o directorio %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "A lista de extensións de fontes é longa de máis" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Produciuse un erro ao procesar o contido %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1901,26 +1903,26 @@ msgstr "" " -c=? Le este ficheiro de configuración\n" " -o=? Estabelece unha opción de configuración" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Non coincide ningunha selección" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A base de datos é antiga, tentando anovar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1928,192 +1930,192 @@ msgstr "" "O formato da base de datos non é correcto. Se a anovou desde unha versión " "antiga de apt, retirea e volva a crear a base de datos" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Non foi posíbel determinar o estado %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "O arquivo non ten un rexistro de control" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Non é posíbel obter un cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: non é posíbel ler o directorio %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: non é posíbel atopar %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: os erros aplícanse ao ficheiro " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Non foi posíbel solucionar %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Fallou o percorrido da árbore" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Non foi posíbel abrir %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DesLig %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Non foi posíbel ler a ligazón %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Non foi posíbel desligar %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Non foi posíbel ligar %s con %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Acadouse o límite de desligado de %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de «override»\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ten unha entrada de «override» de código fonte\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de «override» de binarios\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Non foi posíbel reservar memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Non é posíbel puido abrir %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "«Override» %s liña %lu incorrecta (1)" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Non foi posíbel ler o ficheiro de «override» %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "«Override» %s liña %lu incorrecta (1)" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "«Override» %s liña %lu incorrecta (2)" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "«Override» %s liña %lu incorrecta (3)" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compresión «%s» descoñecido" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "A saída comprimida %s precisa dun conxunto de compresión" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Non foi posíbel crear o FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Non foi posíbel facer a bifurcación" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Fillo de compresión" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Produciuse un erro interno, non foi posíbel crear %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Produciuse un fallo na E/S do subproceso/ficheiro" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Non foi posíbel ler ao calcular o MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Xurdiu un problema ao desligar %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Non foi posíbel cambiar o nome de %s a %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2168,157 +2170,157 @@ msgstr "" " -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Non foi posíbel crear as canles" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Non foi posíbel executar gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Arquivo danado" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "A suma de comprobación do arquivo tar non coincide, está danado" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Sinatura de arquivo incorrecta" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Cabeceira do membro do arquivo incorrecta %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Cabeceira do membro do arquivo incorrecta" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "O arquivo é curto de máis" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Non foi posíbel ler as cabeceiras dos arquivos" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Chamouse a DropNode nun nodo aínda ligado" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Non foi posíbel atopar o elemento hash" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Non foi posíbel reservar un desvío" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Produciuse un erro interno en AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Desvío %s -> %s engadido dúas veces" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Ficheiro de configuración %s/%s duplicado" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Non foi posíbel escribir no ficheiro «%s»" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Non foi posíbel pechar o ficheiro %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "A ruta %s é longa de máis" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s máis dunha vez" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "O directorio %s está desviado" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O paquete tenta escribir no destino do desvío %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "A ruta do desvío é longa de máis" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O directorio %s estase a substituír por algo que non é un directorio" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Non foi posíbel atopar o nodo no seu contedor hash" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "A ruta é longa de máis" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Coincidencia na sobrescritura sen versión para %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Non é posíbel determinar o estado %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Ficheiro de control non analizábel" @@ -2379,211 +2381,206 @@ msgstr "" "desactivado polo usuario." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Non se atopou a selección %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo «%c» descoñecida" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo o ficheiro de configuración %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Produciuse un erro de sintaxe %s:%u: O bloque comeza sen un nome." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Produciuse un erro de sintaxe %s:%u: Etiqueta mal formada" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra despois do valor" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Produciuse un erro de sintaxe %s:%u: Só se poden facer directivas no nivel " "superior" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Produciuse un erro de sintaxe %s:%u: Includes aniñados de máis" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Produciuse un erro de sintaxe %s:%u: Incluído de aquí" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Produciuse un erro de sintaxe %s:%u: Non se admite a directiva «%s»" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Produciuse un erro de sintaxe %s:%u: a directiva «clear» require unha árbore " "de opción como argumento" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra á fin da liña" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Feito" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Feito" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Non se coñece a opción de liña de ordes «%c» [de %s]." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Non se entende a opción de liña de ordes %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "A opción de liña de ordes %s non é booleana" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "A opción %s precisa dun argumento." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Opción %s: A especificación de elemento de configuración debe ter un =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "A opción %s precisa dun argumento enteiro, non «%s»" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "A opción «%s» é longa de máis" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "O senso %s non se entende, probe «true» ou «false»." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operación incorrecta: %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Non é posíbel analizar o punto de montaxe %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Non foi posíbel analizar o CD-ROM" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Produciuse un problema ao pechar o arquivo gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Non foi posíbel obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "A lista de ficheiros non pode ser creada como «%s» non é un directorio" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2591,282 +2588,292 @@ msgstr "" "Ignorando o ficheiro «%s» no directorio «%s» xa que ten unha extensión de " "nome incorrecta" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "O subproceso %s recibiu o sinal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Produciuse un problema ao pechar o arquivo gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Non foi posíbel abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Non foi posíbel abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Non foi posíbel crear o IPC do subproceso" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Non foi posíbel executar o compresor " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Produciuse un problema ao desligar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Produciuse un problema ao sincronizar o ficheiro" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Non ha ningún chaveiro instalado en %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Caché de paquetes baleira" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "O ficheiro de caché de paquetes está danado" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de caché de paquetes é unha versión incompatíbel" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "O ficheiro de caché de paquetes está danado" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT non admite o sistema de versionado «%s»" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "A caché de paquetes construíuse para unha arquitectura diferente" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Suxire" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Conflitos" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Substitúe a" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Fai obsoleto a" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Estraga" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Mellora" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "requirido" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Construindo a árbore de dependencias" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versións candidatas" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Xeración de dependencias" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Lendo a información do estado" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Non foi posíbel abrir o ficheiro de estado %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal construída na lista de orixes %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de orixes %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal construída na lista de orixes %s (tipo)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2875,12 +2882,12 @@ msgstr "" "Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf " "baixo APT::Immediate-Configure para obter máis detalles. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2891,12 +2898,12 @@ msgstr "" "por mor dun bucle de Conflitos e Pre-dependencias. Isto adoita ser malo, " "pero se o quere facer, active a opción APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "O tipo de ficheiros de índices «%s» non está admitido" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2904,7 +2911,7 @@ msgstr "" "O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu " "arquivo." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2912,192 +2919,187 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar " "causado por paquetes retidos." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Non se atopa a lista de directorios %sparcial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Non se atopa a lista de arquivos %sparcial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Non é posíbel bloquear o directorio %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Obtendo o ficheiro %li de %li (restan %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Obtendo o ficheiro %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "O método %s non se iniciou correctamente" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "O sistema de empaquetado «%s» non está admitido" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Non é posíbel analizar %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de " "estado." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Pode querer executar «apt-get update» para corrixir estes problemas" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Non foi posíbel ler a lista de orixes." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Non se entendeu o tipo de inmobilización %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "" "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "A caché ten un sistema de versionado incompatíbel" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Produciuse un erro ao procesar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vaites!, superou o número de nomes de paquetes que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaites!, superou o número de versións que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Vaites!, superou o número de descricións que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vaites!, superou o número de dependencias que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de " "ficheiros" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non foi posíbel atopar a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Lendo as listas de paquetes" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Recollendo as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Produciuse un erro de E/S ao gravar a caché de fontes" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "A sumas «hash» non coinciden" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Os tamaños non coinciden" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operación incorrecta: %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3106,29 +3108,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3139,12 +3141,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3153,12 +3155,12 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3166,67 +3168,67 @@ msgstr "" "Os ficheiros de índices de paquetes están danados. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Non se puido analizar o ficheiro de publicación %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Non hai seccións no ficheiro de publicación %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Non hai entrada de Hash no ficheiro de publicación %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "A entrada «Date» no ficheiro de publicación %s non é válida" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "O bloque de provedor %s non contén unha pegada dixital" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Empregando o punto de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Agardando polo disco...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montando o CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificando... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Etiqueta almacenada: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando o CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Buscando os ficheiros de índices no disco...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3235,7 +3237,7 @@ msgstr "" "Atopáronse %zu índices de paquetes, %zu índices de orixes, %zu índices de " "traducións e %zu sinaturas\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3243,16 +3245,16 @@ msgstr "" "Non é posíbel localizar ningún ficheiro de paquetes. É posíbel que non sexa " "un disco de Debian ou que a arquitectura sexa incorrecta." -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Atopouse a etiqueta «%s»\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Ese non é un nome correcto, volva tentalo.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3261,34 +3263,34 @@ msgstr "" "Este disco chámase: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Copiando as listas de paquetes..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Escribindo a nova lista de orixes\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de orixes deste disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Escribíronse %i rexistros.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3305,39 +3307,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a publicación «%s» de «%s»" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión «%s» de «%s»" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Non foi posíbel atopar a tarefa «%s»" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3346,57 +3348,57 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Non é posíbel seleccionar a versión instalada do paquete %s xa que non está " "instalado" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Executando dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3405,120 +3407,120 @@ msgstr "" "Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou " "foron utilizados algúns antigos no seu lugar" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Retirando %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s completamente retirado" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Tomando nota da desaparición de %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Executando o disparador de post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directorio «%s»" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Preparandose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para o retirado de %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Retirouse %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para retirar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Retirouse %s completamente" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Non é posíbel escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Non se escribiu ningún informe de Apport porque xa se acadou o nivel " "MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - déixase sen configurar" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3526,7 +3528,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que " "é un error provinte dun fallo anterior." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3534,7 +3536,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3542,7 +3544,7 @@ msgstr "" "Non se escribiu un informe de contribución porque a mensaxe de erro indica " "un erro de falta de memoria" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3551,14 +3553,14 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de E/S en dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3567,7 +3569,7 @@ msgstr "" "Non é posíbel bloquear o directorio de administración (%s). Esta usandoo " "algún outro proceso?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3576,14 +3578,14 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" "dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Non está bloqueado" diff --git a/po/hu.po b/po/hu.po index 06c8efb6b..42fa2c9e3 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -21,154 +21,154 @@ msgstr "" "X-Poedit-Country: HUNGARY\n" "X-Poedit-Language: Hungarian\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Csomagnevek összesen : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Csomagstruktúrák összesen: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normális csomagok: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Teljesen virtuális csomagok: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Egyedi virtuális csomagok: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Vegyes virtuális csomagok: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Hiányzik: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Különböző verziók összesen: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Összes különböző leírás: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Függőségek összesen: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Verzió/Fájl kapcsolatok összesen: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Leírás/Fájl kapcsolatok összesen: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "„Biztosítja” kapcsolatok összesen: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Minták összesen: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Függőségiverzió-terület összesen: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Slack terület összesen: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Nyilvántartott terület összesen: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "%s csomagfájl nincs szinkronban." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Nem találhatók csomagok" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Legalább egy keresési mintát meg kell adnia" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Ez a csomag nem található: %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Csomagfájlok:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomagfájlra" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Rögzített csomagok:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nem található)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Telepítve: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Jelölt: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(nincs)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Csomagrögzítés: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s erre: %s lefordítva ekkor: %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -239,28 +239,28 @@ msgstr "" "Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további " "információkért.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemez”" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "„%s” csatolása a(z) „%s” könyvtárba meghiúsult" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ismételje meg a folyamatot készlete többi CD-jével is." @@ -295,48 +295,48 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "„%s” kiválasztása forráscsomagként „%s” helyett\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" "A(z) „%2$s” csomag el nem érhető „%1$s” verziójának figyelmen kívül hagyása" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésűre állítva.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s megjelölve automatikusan telepítettként.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -344,20 +344,20 @@ msgstr "" "Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark " "auto” parancsokat." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, a problémamegoldó hibát okozott" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Nem lehet zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" @@ -383,80 +383,80 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött „%s” fájl kihagyása\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a „csak letöltés” módban" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +465,17 @@ msgstr "" "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal " "kapcsolatban lásd az apt.conf(5) APT::Architectures részét." -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási függőségeinek információit letölteni" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,7 +484,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem " "engedélyezett a(z) „%4$s” csomagokon" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -493,14 +493,14 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem " "található" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl " "friss" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -509,7 +509,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető " "verziója nem elégíti ki a verziókövetelményeket" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -518,30 +518,30 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs " "jelölt verziója" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetők ki." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -630,7 +630,7 @@ msgstr "" "információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -640,7 +640,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -653,53 +653,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s nem jelölhető meg, mivel nincs telepítve.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s már be van állítva kézi telepítésűre.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s már meg van jelölve automatikusan telepítettként.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s már be van állítva visszafogásra.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s eddig sem volt visszafogva.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Nem található a(z) %s, a várakozás után sem" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s beállítva visszafogásra.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Visszafogás törölve ezen: %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -747,7 +747,7 @@ msgstr "" "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n" "információkért." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -796,52 +796,52 @@ msgstr "" msgid "Disk not found." msgstr "A lemez nem található." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "A fájl nem található" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Érvénytelen URI, helyi URI-k nem kezdődhetnek //-rel" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Bejelentkezés" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Nem lehet a partner nevét megállapítani" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Nem lehet a helyi nevet megállapítani" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "A kiszolgáló visszautasította a kapcsolatot: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Hibás USER, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Hibás PASS, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -849,124 +849,126 @@ msgstr "" "Meg lett adva proxy kiszolgáló, de nincs bejelentkezési parancsfájl és az " "Acquire::ftp::ProxyLogin üres." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "A bejelentkezési parancsfájl „%s” parancsa sikertelen, a kiszolgáló üzenete: " "%s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Hibás TYPE, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Időtúllépés a kapcsolatban" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Olvasási hiba" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "A válasz túlcsordította a puffert." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protokollhiba" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Írási hiba" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Nem lehet létrehozni a foglalatot" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Sikertelen" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Nem lehet kapcsolódni a passzív foglalathoz." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "A getaddrinfo nem talált figyelőfoglalatot" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Nem lehet összekapcsolódni a foglalattal" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Nem lehet figyelni a foglalaton" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Nem lehet megállapítani a foglalat nevét" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Nem lehet PORT parancsot küldeni" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ismeretlen címcsalád: %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Hibás EPRT, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Az adatfoglalat túllépte az időkorlátot" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Az adatátvitel sikertelen, a kiszolgáló üzenete: „%s”" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Lekérdezés" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Nem lehet meghívni " @@ -1002,7 +1004,7 @@ msgstr "Nem lehet kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" @@ -1032,37 +1034,37 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nem lehet csatlakozni ehhez: %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata." -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Legalább egy aláírás érvénytelen." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1070,146 +1072,146 @@ msgstr "" "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető " "el:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Az üres fájlok biztosan nem érvényes csomagok" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "A kiválasztás sikertelen" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Rossz fejlécsor" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "A HTTP-kiszolgáló érvénytelen válaszfejlécet küldött" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "A HTTP-kiszolgáló érvénytelen Content-Length fejlécet küldött" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "A HTTP-kiszolgáló érvénytelen Content-Range fejlécet küldött" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "A HTTP-kiszolgáló tartománytámogatása sérült" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Ismeretlen dátumformátum" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Rossz fejlécadatok" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Belső hiba" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem fejeződött be" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Letöltendő adatmennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Letöltendő adatmennyiség: %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "A művelet után %sB lemezterület szabadul fel.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1220,19 +1222,19 @@ msgstr "" "A folytatáshoz írja be ezt a mondatot: „%s”\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Megszakítva." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Folytatni akarja?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1240,19 +1242,19 @@ msgstr "" "Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” " "parancsot, vagy használja a --fix-missing kapcsolót." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1266,15 +1268,15 @@ msgstr[1] "" "A következő csomagok eltűntek a rendszerből, mivel\n" "az összes fájlt más csomagok fölülírták:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1292,15 +1294,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információk segíthetnek megoldani a problémát:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, az AutoRemover sérült" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1312,7 +1314,7 @@ msgstr[1] "" "A következő csomagok automatikusan lettek telepítve, és már nincs rájuk " "szükség:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1321,18 +1323,18 @@ msgstr[0] "%lu csomag automatikusan lett telepítve, és már nincs rá szüksé msgstr[1] "" "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti." msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1340,7 +1342,7 @@ msgstr "" "Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot " "csomagok nélkül (vagy telepítse a függőségeket is!)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1352,145 +1354,145 @@ msgstr "" "használja, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Törött csomagok" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "A hitelesítési figyelmeztetés felülbírálva.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " vagy" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1498,27 +1500,27 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" @@ -1527,7 +1529,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[I/n]" @@ -1535,91 +1537,91 @@ msgstr "[I/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[i/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " sikertelen." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Kész" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbálja a -f használatával." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Belső hiba, az AllUpgrade megsértett valamit" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Kész" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1631,43 +1633,43 @@ msgstr "" " Ne feledje, hogy a zárolás is ki van kapcsolva,\n" " így ne számítson a jelenlegi helyzet valósságára!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "„%s” átnevezése sikertelen erre: %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Találat " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Letöltés:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Mellőz " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Hiba " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Letöltve %sB %s alatt (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Folyamatban]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1680,19 +1682,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nem sikerült ide váltani: %s" @@ -1721,11 +1723,11 @@ msgstr "A(z) „%s” tükörfájl nem olvasható" msgid "[Mirror: %s]" msgstr "[Tükör: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" @@ -1765,7 +1767,7 @@ msgstr "előtti hibák fontosak. Javítsa azokat, és futtassa az [I]nstallt új msgid "Merging available information" msgstr "Elérhető információk egyesítése" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1790,40 +1792,40 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "A csomagkiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Hiba a(z) %s könyvtár feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "A forráskiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Hiba a tartalomfájl fejlécének írásakor" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Hiba %s tartalmának feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1905,26 +1907,26 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nincs illeszkedő kiválasztás" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) „%s” csomagfájlcsoportból" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A DB megsérült, a fájl átnevezve %s.old-ra" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A DB régi, kísérlet a következő frissítésére: %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1932,192 +1934,192 @@ msgstr "" "Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról " "frissített, akkor távolítsa el, és hozza létre újra az adatbázist." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "F: %s nem érhető el\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "H: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "F: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "H: Hibás a fájl " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Nem sikerült feloldani ezt: %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Fabejárás nem sikerült" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "readlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "%s törlése sikertelen" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s linkelése sikertelen ehhez: %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " a DeLink korlátja (%sB) elérve.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nem sikerült memóriát lefoglalni" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s megnyitása sikertelen" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "%s felülbírálás deformált a(z) %llu. sorában #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "„%s” tömörítési algoritmus ismeretlen" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Nem sikerült FILE*-ot létrehozni" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Nem sikerült forkolni" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Gyermekfolyamat tömörítése" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Belső hiba, %s létrehozása sikertelen" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Olvasási hiba az MD5 kiszámításakor" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Hiba %s törlésekor" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "„%s” átnevezése sikertelen erre: %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2171,157 +2173,157 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Nem sikerült adatcsatornákat létrehozni" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Nem sikerült a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Hibás archívum" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Érvénytelen archívum-aláírás" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Hiba az archívumtag-fejléc olvasásakor" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Érvénytelen archívumtag-fejléc: %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Érvénytelen archívumtag-fejléc" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Az archívum túl rövid" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Nem sikerült olvasni az archívumfejléceket" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "A DropNode hívása egy még mindig linkelt node-ra történt" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "A hash elem nem található!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nem lehet eltérítést lefoglalni" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Belső hiba az AddDiversion hívásban" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Kísérlet eltérítés felülírására: %s -> %s és %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "A(z) %s fájl írása sikertelen" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "A(z) %s fájl bezárása sikertelen" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "A(z) %s útvonal túl hosszú" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "A(z) %s többszöri kicsomagolása" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "A(z) %s könyvtár eltérítve" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Az eltérített útvonal túl hosszú" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Az útvonal túl hosszú" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Csomagtalálat felülírása %s verziója nélkül" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s nem érhető el" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Belső hiba, %s tag nem található" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Értelmezhetetlen control fájl" @@ -2382,211 +2384,206 @@ msgstr "" "automatikus emelést." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lin %lió %lip %limp" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lió %lip %limp" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%lip %limp" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%limp" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "%s kiválasztás nem található" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ismeretlen típusrövidítés: „%c”" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurációs fájl megnyitása" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Szintaktikai hiba %s:%u: „%s” nem támogatott előírás" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Szintaktikai hiba %s:%u: a törlési parancs egy beállítási fát vár " "argumentumként" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Hiba!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Kész" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Kész" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "A(z) „%c” parancssori kapcsoló [a következőből: %s] ismeretlen." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "%s parancssori kapcsoló értelmezhetetlen" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "%s parancssori kapcsoló nem logikai" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "%s kapcsolóhoz argumentum szükséges." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "%s kapcsoló: a konfigurációs elem megadásához szükséges egy =<érték> rész." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s kapcsoló egész, és nem „%s” típusú argumentumot követel meg" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Túl hosszú „%s” kapcsoló" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s jelentés nem értelmezhető, próbálja a true vagy false értékeket." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "%s érvénytelen művelet" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "%s csatolási pont nem érhető el" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Hiba a(z) %s gzip fájl bezárásakor" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "A fájlok listáját nem lehetett létrehozni, mert „%s” nem könyvtár" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "„%s” figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nem szabályos fájl" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nincs " "fájlkiterjesztése" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2594,287 +2591,297 @@ msgstr "" "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen " "fájlkiterjesztése van" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "A(z) %s alfolyamat %u számú szignált kapott." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Hiba a(z) %s gzip fájl bezárásakor" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni a(z) %s fájlt" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Nem lehet megnyitni a(z) %d fájlleírót" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Nem sikerült az alfolyamat IPC-t létrehozni" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Nem sikerült elindítani a tömörítőt " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "olvasás, még kellene %llu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Hiba a(z) %s fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Hiba a(z) %s fájl törlésekor" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "sikertelen átnevezés, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Nincs kulcstartó telepítve ide: %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Üres csomaggyorsítótár" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "A csomaggyorsítótár fájl megsérült" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "A csomaggyorsítótár-fájl inkompatibilis verziójú" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "A csomaggyorsítótár-fájl sérült, túl kicsi" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ez az APT nem támogatja a(z) „%s” verziórendszert" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "A csomaggyorsítótár egy másik architektúrához készült" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Függ ettől" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Függ ettől (előfüggés)" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Javasolja" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Ajánlja" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Ütközik" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Kicseréli" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Elavulttá teszi" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Töri" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Bővíti" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "fontos" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "szükséges" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "szabványos" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcionális" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Függőségi fa építése" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Lehetséges verziók" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Függőséggenerálás" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Állapotinformációk olvasása" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "%s állapotfájl megnyitása sikertelen" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "%s átmeneti állapotfájl írása sikertelen" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] " "feldolgozhatatlan)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl " "rövid)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "érvényes hozzárendelés)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " "tartalmaz kulcsot)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak " "nincs értéke)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2883,12 +2890,12 @@ msgstr "" "Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért " "lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "A(z) „%s” beállítása sikertelen" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2899,19 +2906,19 @@ msgstr "" "eltávolítását, ami ütközési/előfüggőségi hurkot okoz. Ez gyakran rossz, de " "ha tényleg ezt akarja tenni, aktiválja az APT::Force-LoopBreak opciót." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "A(z) „%s” indexfájltípus nem támogatott" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2919,92 +2926,92 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "A(z) %spartial listakönyvtár hiányzik." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "A(z) %spartial archívumkönyvtár hiányzik." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "%s könyvtár zárolása sikertelen" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li/%li fájl letöltése (%s marad)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "%li/%li fájl letöltése" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, 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:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az " "Entert." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) „%s” csomagrendszer nem támogatott" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszertípus nem határozható meg" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s nem érhető el." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "A csomaglisták vagy az állapotfájl nem dolgozhatók fel vagy nem nyithatók " "meg." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javításához" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3013,100 +3020,95 @@ msgstr "" "A(z) „%s” érték érvénytelen az APT::Default-Release beállításhoz, mert nincs " "ilyen kiadás a forrásokban" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Érvénytelen rekord a(z) %s beállításfájlban, nincs Package fejléc" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "A(z) %s rögzítéstípus nem értelmezhető" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Az APT által kezelhető csomagnevek száma túllépve." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Az APT által kezelhető csomagverziók száma túllépve." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Az APT által kezelhető csomagleírások száma túllépve." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Az APT által kezelhető függőségek száma túllépve." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása " "közben" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Csomaglisták olvasása" # FIXME -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "„Biztosítja” kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "sikertelen átnevezés, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "A méret nem megfelelő" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "%s érvénytelen művelet" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3115,16 +3117,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3133,12 +3135,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3148,12 +3150,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3162,79 +3164,79 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "A(z) %s Release fájl nem dolgozható fel" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM leválasztása...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM csatolása...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Azonosítás... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Tárolt címke: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM leválasztása...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Indexfájlok keresése a lemezen...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3243,7 +3245,7 @@ msgstr "" "%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás " "megtalálva\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3251,16 +3253,16 @@ msgstr "" "Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem " "megfelelő az architektúra?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Talált címke: „%s”\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "A név érvénytelen, próbálja újra.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3269,34 +3271,34 @@ msgstr "" "A lemez neve: \n" "„%s”\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rekord kiírva %i eltérő fájllal\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n" @@ -3311,37 +3313,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "„%s” kiadás nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "„%s” verzió nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "„%s” feladat nem található" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3350,54 +3352,54 @@ msgstr "" "„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, " "mert egyikkel sem rendelkezik" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "„%s” csomag telepített verziója nem választható ki, mert nincs telepítve" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "A helyzet elküldése a solvernek" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Kérés küldése a solvernek" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Felkészülés megoldás fogadására" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Külső solver végrehajtása" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "A dpkg futtatása" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3405,118 +3407,118 @@ msgstr "" "Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, " "vagy régebbiek lettek felhasználva." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s telepítése" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s teljes eltávolítása" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "„%s” eltűnése feljegyezve" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "A(z) %s telepítés utáni trigger futtatása" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "A(z) „%s” könyvtár hiányzik" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "A(z) „%s” fájl megnyitása sikertelen" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s telepítve" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nem lehet írni ebbe: %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "függőségi hibák - a csomag beállítatlan maradt" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3524,7 +3526,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba " "egy korábbi hiba következménye." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3532,7 +3534,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a " "lemez" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3540,7 +3542,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási " "hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3548,13 +3550,13 @@ msgstr "" "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren " "lévő hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Nem került kiírásra apport jelentés, mert a hibaüzenet dpkg I/O hibát jelez" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3563,7 +3565,7 @@ msgstr "" "Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat " "használja?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3571,7 +3573,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3579,7 +3581,7 @@ msgstr "" "A dpkg megszakadt, saját kezűleg kell futtatnia a(z) „%s” parancsot a " "probléma megoldásához. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Nincs zárolva" diff --git a/po/it.po b/po/it.po index b58f1fe10..565350928 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,155 +20,155 @@ msgstr "" "X-Launchpad-Export-Date: 2012-06-25 19:48+0000\n" "X-Generator: Gtranslator 2.91.6\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Il pacchetto %s versione %s ha una dipendenza non soddisfatta:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Totale nomi dei pacchetti: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Totale strutture dei pacchetti: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Pacchetti normali: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Pacchetti virtuali puri: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pacchetti virtuali singoli: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Pacchetti virtuali misti: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Mancante: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Totale versioni distinte: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Totale descrizioni distinte: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Totale dipendenze: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Totale relazioni ver/file: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Totale relazioni desc/file: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Totale corrispondenze fornite: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Totale stringhe globalizzate: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Totale spazio dipendenza di versione: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Totale spazio inutilizzato: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Totale spazio occupato: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Il file dei pacchetti %s non è sincronizzato." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Nessun pacchetto trovato" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "È necessario specificare almeno un modello per la ricerca" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "File dei pacchetti:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "La cache non è sincronizzata, impossibile referenziare un file di pacchetti" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pacchetti con gancio:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(non trovato)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Installato: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(nessuno)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Gancio del pacchetto: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per %s compilato il %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -241,34 +241,35 @@ msgstr "" "Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e \n" "apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" -"Impossibile rilevare automaticamente un CD-ROM oppure è stato trovato con " -"il\n" -"punto di mount predefinito.\n" -"È possibile provare l'opzione --cdrom per impostare il punto di mount del\n" -"CD-ROM. Per maggiori informazioni sull'autorilevamento e sul punto di mount\n" -"del CD-ROM, consultare \"man apt-cdrom\"." - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\"" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Inserire un disco nell'unità e premere Invio" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Mount di \"%s\" su \"%s\" non riuscito" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +#, fuzzy +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" +"Impossibile rilevare automaticamente un CD-ROM oppure è stato trovato con " +"il\n" +"punto di mount predefinito.\n" +"È possibile provare l'opzione --cdrom per impostare il punto di mount del\n" +"CD-ROM. Per maggiori informazioni sull'autorilevamento e sul punto di mount\n" +"del CD-ROM, consultare \"man apt-cdrom\"." + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ripetere questo processo per il resto dei CD." @@ -304,50 +305,50 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "" "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "" "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "" "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\"" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s impostato automaticamente come installato.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -355,20 +356,20 @@ msgstr "" "Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual" "\" al suo posto." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Impossibile bloccare la directory di scaricamento" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" @@ -395,80 +396,80 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -477,17 +478,17 @@ msgstr "" "Informazioni sull'architettura non disponibili per %s. Consultare apt." "conf(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -496,7 +497,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -505,14 +506,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo recente" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -521,7 +522,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché la versione " "candidata del pacchetto %s non può soddisfare i requisiti di versione" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -530,30 +531,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -643,7 +644,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5).\n" " Questo APT ha i poteri della Super Mucca.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -653,7 +654,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -666,53 +667,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s non può essere segnato perché non è installato.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s è già stato impostato come installato manualmente.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s è già stato impostato come installato automaticamente.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s è già stato impostato come bloccato.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s era già non bloccato.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s impostato come bloccato.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Blocco su %s annullato.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -761,7 +762,7 @@ msgstr "" "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n" "apt.conf(5)." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -809,52 +810,52 @@ msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." msgid "Disk not found." msgstr "Disco non trovato" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI non valido, gli URI locali non devono iniziare con //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Accesso in corso" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Impossibile determinare il nome del nodo" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Impossibile determinare il nome locale" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Il server ha rifiutato la connessione e riporta: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER non riuscito, il server riporta: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS non riuscito, il server riporta: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -862,123 +863,125 @@ msgstr "" "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::" "ftp::ProxyLogin è vuoto." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE non riuscito, il server riporta: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Connessione scaduta" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Errore di lettura" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Una risposta ha superato le dimensioni del buffer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Errore di scrittura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Impossibile creare un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Impossibile connettersi al socket dati, tempo esaurito per la connessione" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Non riuscito" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Impossibile connettersi alla socket passiva." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Impossibile eseguire bind() su un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Impossibile eseguire listen() su un socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Impossibile determinare il nome del socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Impossibile inviare il comando PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT non riuscito, il server riporta: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Connessione al socket dati terminata" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossibile recuperare il file, il server riporta: \"%s\"" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Socket dati terminato" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\"" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Interrogazione" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Impossibile invocare " @@ -1014,7 +1017,7 @@ msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s" @@ -1045,25 +1048,25 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: firma corretta, ma non è possibile determinare l'impronta " "della chiave." -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "È stata trovata almeno una firma non valida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è " "installato)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1072,15 +1075,15 @@ msgstr "" "Il file con la firma in chiaro non è valido, ottenuto \"%s\" (la rete " "richiede autenticazione?)" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1088,140 +1091,140 @@ msgstr "" "Le seguenti firme non sono state verificate perché la chiave pubblica non è " "disponibile:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Errore nel leggere dal server" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Riga header non corretta" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un header Content-Length non valido" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un header Content-Range non valido" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha un supporto del range non corretto" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Errore interno" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages è stato chiamato con un pacchetto " "danneggiato." -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" "I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è stato terminato" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "È necessario scaricare %sB/%sB di archivi.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "È necessario scaricare %sB di archivi.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Spazio libero in %s insufficiente." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "È stata specificata la modalità \"Trivial Only\", ma questa non è " @@ -1229,11 +1232,11 @@ msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Sì, esegui come da richiesta." -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1244,19 +1247,19 @@ msgstr "" "Per continuare scrivere la frase \"%s\"\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Interrotto." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Continuare?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Scaricamento di alcuni file non riuscito" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1264,19 +1267,19 @@ msgstr "" "Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-" "get update\" o provare l'opzione \"--fix-missing\"." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su supporti estraibili non è ancora supportato" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Interruzione dell'installazione." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1290,16 +1293,16 @@ msgstr[1] "" "I seguenti pacchetti sono spariti dal sistema poiché\n" "tutti i file sono stati sovrascritti da altri pacchetti:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1317,15 +1320,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Errore interno, AutoRemover ha rovinato qualche cosa" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1338,7 +1341,7 @@ msgstr[1] "" "I seguenti pacchetti sono stati installati automaticamente e non sono più " "richiesti:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1349,18 +1352,18 @@ msgstr[1] "" "%lu pacchetti sono stati installati automaticamente e non sono più " "richiesti.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo." msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1368,7 +1371,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " "(o specificare una soluzione)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1380,145 +1383,145 @@ msgstr "" "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n" "non sono ancora stati creati o sono stati rimossi da Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Pacchetti danneggiati" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti saranno inoltre installati:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati." -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Alcuni pacchetti non possono essere autenticati" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Installare questi pacchetti senza verificarli?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installato]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Installato]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Installato]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Installato]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ma non è installabile" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ma non è installato" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " oppure" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1527,27 +1530,27 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" @@ -1556,7 +1559,7 @@ msgstr "%lu non completamente installati o rimossi.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[S/n]" @@ -1564,91 +1567,91 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " non riuscita." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Fatto" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Eseguito" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1660,44 +1663,44 @@ msgstr "" " Inoltre, il meccanismo di blocco non è attivato e non è quindi\n" " utile dare importanza a tutto ciò per una situazione reale." -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Rinomina di %s in %s non riuscita" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Trovato " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Scaricamento di:" # (ndt) questa non so cosa voglia dire -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Recuperati %sB in %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [In lavorazione]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1710,19 +1713,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Impossibile passare a %s" @@ -1751,11 +1754,11 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\"" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" @@ -1800,7 +1803,7 @@ msgstr "" msgid "Merging available information" msgstr "Unione delle informazioni disponibili" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1824,40 +1827,40 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Impossibile trovare la versione di debconf. È installato?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "L'elenco dell'estensione del pacchetto è troppo lungo" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Errore nell'elaborare la directory %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "L'elenco dell'estensione del sorgente è troppo lungo" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Errore nella scrittura dell'intestazione nel file \"contents\"" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Errore nell'elaborare i contenuti %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1938,26 +1941,26 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione arbitraria di configurazione" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nessuna selezione corrisponde" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mancano alcuni file nel file group di pacchetti \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Il database era danneggiato, il file è stato rinominato in %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Il database è vecchio, tentativo di aggiornamento %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1965,195 +1968,195 @@ msgstr "" "Il formato del database non è valido. Se è stato eseguito l'aggiornamento da " "una vecchia versione di apt, rimuovere e ricreare il database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossibile aprire il file del database %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Impossibile eseguire stat su %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "L'archivio non ha un campo \"control\"" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" # (ndt) messo A per Avviso # Inizio con la maiuscola dopo i : perché mi sa che in molti # casi molte stringhe sono così -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Impossibile leggere la directory %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Impossibile eseguire stat su %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Gli errori si applicano al file " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Risoluzione di %s non riuscita" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Visita dell'albero non riuscita" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Apertura di %s non riuscita" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Delink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Esecuzione di readlink su %s non riuscita" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Esecuzione di unlink su %s non riuscita" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Collegamento di %s a %s non riuscito" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Raggiunto il limite di DeLink di %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "L'archivio non ha un campo \"package\"" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " il responsabile di %s è %s non %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ha un campo source override\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s non ha neppure un campo binario override\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Allocazione della memoria non riuscita" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossibile aprire %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Override %s riga %llu malformato #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Lettura del file override %s non riuscita" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Override %s riga %llu malformato #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Override %s riga %llu malformato #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Override %s riga %llu malformato #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo di compressione \"%s\" sconosciuto" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "L'output compresso %s necessita di un insieme di compressione" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Creazione di FILE* non riuscita" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Fork non riuscita" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Sottoprocesso compresso" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Errore interno, creazione di %s non riuscita" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "I/O al sottoprocesso/file non riuscito" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Lettura durante l'elaborazione MD5 non riuscita" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Rinomina di %s in %s non riuscita" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2205,158 +2208,158 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Creazione delle pipe non riuscita" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Esecuzione di gzip non riuscita " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Archivio danneggiato" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum di tar non riuscito, archivio danneggiato" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Intestazione TAR di tipo %u sconosciuta, member %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Firma dell'archivio non valida" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Errore nel leggere l'intestazione member dell'archivio" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Intestazione member dell'archivio %s non valida" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Intestazione member dell'archivio non valida" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "L'archivio è troppo piccolo" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Lettura delle intestazioni dell'archivio non riuscita" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode invocata su un nodo ancora collegato" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Localizzazione dell'elemento hash non riuscita." -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Allocazione della deviazione non riuscita" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Errore interno in AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doppia aggiunta di deviazione %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplicato %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Scrittura del file %s non riuscita" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s non riuscita" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Il percorso %s è troppo lungo" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Estrazione di %s eseguita più di una volta" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "La directory %s è deviata" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" "Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Il percorso della deviazione è troppo lungo" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "La directory %s sta per essere sostituita da una non-directory" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Localizzazione del nodo nel suo hash bucket non riuscita" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Il percorso è troppo lungo" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Impossibile eseguire stat su %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Errore interno, impossibile trovare il membro %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "File \"control\" non analizzabile" @@ -2418,216 +2421,211 @@ msgstr "" "ridimensionamento automatico è stato disabilitato dall'utente." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lig %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo di abbreviazione non riconosciuto: \"%c\"" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Apertura file di configurazione %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Errore di sintassi %s:%u: tag non corretto" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello " "più alto" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Errore di sintassi %s:%u: incluso da qui" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata" # (ndt) sarebbe da controllare meglio... -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Errore di sintassi %s:%u: la direttiva clear richiede un albero di opzioni " "come argomento" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errore" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fatto" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "..." #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s... %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Opzione a riga di comando %s non comprensibile" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Opzione a riga di comando %s non booleana" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "L'opzione %s richiede un argomento." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Opzione %s: la specifica di configurazione dell'oggetto deve avere un " "=<valore>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "L'opzione %s richiede un argomento intero, non \"%s\"" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opzione \"%s\" troppo lunga" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operazione %s non valida" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossibile eseguire stat sul punto di mount %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Esecuzione di stat sul CD-ROM non riuscita" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Si è verificato un problema nel chiudere il file gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Blocco disabilitato per il file di blocco in sola lettura %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di blocco %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Blocco disabilitato per il file di blocco %s montato via nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Impossibile impostare il blocco %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "L'elenco dei file non può essere creato poiché \"%s\" non è una directory" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha " "un'estensione" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2635,288 +2633,298 @@ msgstr "" "Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione " "non valida" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Il sottoprocesso %s ha ricevuto il segnale %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s è uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Si è verificato un problema nel chiudere il file gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Impossibile aprire il descrittore del file %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Creazione di un sottoprocesso IPC non riuscita" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Esecuzione non riuscita del compressore " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, 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:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Si è verificato un problema nel sincronizzare il file" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "rename() non riuscita: %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Nessun portachiavi installato in %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Cache dei pacchetti vuota" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Il file della cache dei pacchetti è danneggiato" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "La versione del file della cache dei pacchetti è incompatibile" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Il file cache del pacchetto è danneggiato, è troppo piccolo" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Questo APT non supporta il sistema di versione \"%s\"" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "" "Il file della cache dei pacchetti è stato generato per un'altra architettura" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Dipende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Pre-dipende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Consiglia" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Raccomanda" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Va in conflitto" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Sostituisce" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Rende obsoleto" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Rompe" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Migliora" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "richiesto" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opzionale" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Generazione albero delle dipendenze" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versioni candidate" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Generazione delle dipendenze" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Lettura informazioni sullo stato" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Apertura del file di stato %s non riuscita" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Scrittura del file temporaneo di stato %s non riuscita" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file di pacchetto %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file di pacchetto %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non " "analizzabile)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo " "corta)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è " "un'assegnazione)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una " "chiave)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non " "ha un valore)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La riga %lu nel file %s non è corretta (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La riga %lu nel file %s non è corretta (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La riga %lu nel file %s non è corretta (absolute dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La riga %lu nel file %s non è corretta (dist parse)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Apertura di %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Riga %u troppo lunga nel file %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La riga %u nel file %s non è corretta (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2926,12 +2934,12 @@ msgstr "" "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::" "Immediate-Configure\" (%d)." -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Impossibile configurare \"%s\". " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2943,12 +2951,12 @@ msgstr "" "situazione critica, ma se si vuole realmente procedere, attivare l'opzione " "APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Il file indice di tipo \"%s\" non è supportato" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2956,7 +2964,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " "archivio." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2964,93 +2972,93 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " "potrebbe essere causato da pacchetti bloccati." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." # (ndt) sarebbe da controllare meglio assieme a quella dopo -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Manca la directory di liste %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Manca la directory di archivio %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Impossibile bloccare la directory %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Scaricamento file %li di %li (%s rimanente)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Scaricamento file %li di %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Il metodo %s non si è avviato correttamente" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di pacchetti \"%s\" non è supportato" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Impossibile eseguire stat su %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "È necessario inserire alcuni URI di tipo \"source\" nel file sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "L'elenco dei pacchetti o il file di stato non può essere letto o aperto." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "È consigliato eseguire \"apt-get update\" per correggere questi problemi" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Impossibile leggere l'elenco dei sorgenti." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3059,104 +3067,99 @@ msgstr "" "Il valore \"%s\" non è valido per APT::Default-Release poiché tale release " "non è disponibile dalle sorgenti" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package" "\"" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Impossibile comprendere il tipo di gancio %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Priorità per il gancio non specificata (o zero)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "La cache ha un sistema di gestione delle versioni incompatibile" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Si è verificato un errore nell'elaborare %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "È stato superato il numero di nomi di pacchetti che questo APT può gestire." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "È stato superato il numero di versioni che questo APT può gestire." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "È stato superato il numero di descrizioni che questo APT può gestire." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "È stato superato il numero di dipendenze che questo APT può gestire." # (ndt) il primo è il nome del pacchetto, il secondo la versione -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle " "dipendenze" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Lettura elenco dei pacchetti" # (ndt) non mi convince per niente, ma vediamo cosa salta fuori -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Il file fornisce" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvare la cache sorgente" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "rename() non riuscita: %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Somma hash non corrispondente" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Le dimensioni non corrispondono" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operazione %s non valida" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3165,17 +3168,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3184,12 +3187,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3199,12 +3202,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3213,14 +3216,14 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3228,67 +3231,67 @@ msgstr "" "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" " "per il pacchetto %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Impossibile analizzare il file Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Nessuna sezione nel file Release %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Nessuna voce Hash nel file Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Voce \"Valid-Until\" nel file Release %s non valida" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Voce \"Date\" nel file Release %s non valida" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Il blocco vendor %s non contiene impronte" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Viene usato il punto di mount del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Smontaggio CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificazione... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Etichette archiviate: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Smontaggio CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Analisi del disco per file indice...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3297,7 +3300,7 @@ msgstr "" "Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di " "traduzione e %zu firme\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3305,16 +3308,16 @@ msgstr "" "Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un " "disco Debian o potrebbe essere l'architettura errata." -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Trovata l'etichetta \"%s\"\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Questo non è un nome valido, riprovare.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3323,34 +3326,34 @@ msgstr "" "Questo disco è chiamato: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Copia elenco pacchetti..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Scrittura nuovo elenco sorgenti\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Scritti %i record con %i file mancanti.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Scritti %i record con %i file senza corrispondenze\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3367,41 +3370,41 @@ msgid "Hash mismatch for: %s" msgstr "Hash non corrispondente per %s" # (ndt) dovrebbe essere inteso il file Release -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, 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:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" per \"%s\" non trovato" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossibile trovare il task \"%s\"" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3410,57 +3413,57 @@ msgstr "" "Impossibile selezionare la versione installata o la candidata dal pacchetto " "\"%s\" poiché non sono presenti" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Impossibile selezionare la versione installata dal pacchetto %s poiché non è " "installato" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Invia lo scenario al solver" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Invia la richiesta al solver" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Preparazione alla ricezione della soluzione" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Il solver esterno è terminato senza un errore di messaggio" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Esecuzione solver esterno" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Esecuzione di dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3468,120 +3471,120 @@ msgstr "" "Impossibile scaricare alcuni file di indice: saranno ignorati o verranno " "usati quelli vecchi." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Installazione di %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Rimozione completa di %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Notata la sparizione di %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Esecuzione comando di post installazione %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Directory \"%s\" mancante" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Impossibile aprire il file \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Estrazione di %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Pacchetto %s installato" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione alla rimozione di %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Pacchetto %s rimosso" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione completa di %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossibile scrivere in %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "L'operazione è stata interrotta prima di essere completata" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " "di MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "Problemi con le dipendenze - Viene lasciato non configurato" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3589,7 +3592,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica la " "presenza di un fallimento precedente." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3597,7 +3600,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3605,7 +3608,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di memoria esaurita" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3614,14 +3617,14 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di I/O di dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3630,7 +3633,7 @@ msgstr "" "Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un " "altro processo potrebbe tenerla occupata." -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3639,7 +3642,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3647,7 +3650,7 @@ msgstr "" "dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il " "problema. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Non bloccato" diff --git a/po/ja.po b/po/ja.po index f85224cf9..5f8baad64 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -18,154 +18,154 @@ msgstr "" "Content-Transfer-Encoding: 8 bit\n" "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "パッケージ名総数: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "パッケージ構造総数: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " 通常パッケージ: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " 純粋仮想パッケージ: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " 単一仮想パッケージ: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " 複合仮想パッケージ: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " 欠落: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "個別バージョン総数: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "個別説明総数: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "依存関係総数: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "バージョン/ファイル関係総数: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "説明/ファイル関係総数: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "提供マッピング総数: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Glob 文字列の総数: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "総依存関係・バージョン容量: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "総空き容量: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "総占有容量: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Package ファイル %s が同期していません。" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "パッケージが見つかりません" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "検索パターンはちょうど 1 つだけ指定してください" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "パッケージファイル:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pin されたパッケージ:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(見つかりません)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " インストールされているバージョン: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " 候補: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(なし)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " パッケージ Pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s コンパイル日時: %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -235,32 +235,33 @@ msgstr "" " -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n" "詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" -"CD-ROM が自動検出されなかったか、デフォルトで利用するマウントポイントに見当た" -"りませんでした。CD-ROM のマウントポイントを設定するために --cdrom オプション" -"を試すことができます。CD-ROM の自動検出およびマウントポイントの詳細について" -"は、'man apt-cdrom' を参照してください。" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "このディスクに、'Debian 5.0.3 Disk 1' のような名前を付けてください" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "ディスクをドライブに入れて Enter キーを押してください" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s' を '%s' にマウントできませんでした" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +#, fuzzy +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" +"CD-ROM が自動検出されなかったか、デフォルトで利用するマウントポイントに見当た" +"りませんでした。CD-ROM のマウントポイントを設定するために --cdrom オプション" +"を試すことができます。CD-ROM の自動検出およびマウントポイントの詳細について" +"は、'man apt-cdrom' を参照してください。" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。" @@ -297,47 +298,47 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "パッケージ '%2$s' の利用できないバージョン '%1$s' を無視" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s は自動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -345,20 +346,20 @@ msgstr "" "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり" "に使用してください。" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" @@ -385,80 +386,80 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,17 +468,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." "conf(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +487,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +496,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" "ケージは新しすぎます" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +512,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +521,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -635,7 +636,7 @@ msgstr "" "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -645,7 +646,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -658,53 +659,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s をインストールされていないものとしてマークできません\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s は手動でインストールしたとすでに設定されています。\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s は自動でインストールしたとすでに設定されています。\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s はすでに保留に設定されています。\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s はすでに保留されていません。\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s は保留に設定されました。\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "%s の保留を解除しました。\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -751,7 +752,7 @@ msgstr "" "さらなる情報については、マニュアルページ apt-mark(8) および apt.conf(5) を参" "照してください。" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -799,52 +800,52 @@ msgstr "%s の CD-ROM は使用中のためアンマウントすることがで msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "不正な URI です。ローカルの URI は // で始まってはいけません" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "ログインしています" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "ピアネームを決定することができません" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "ローカルネームを決定することができません" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "サーバから接続を拒絶されました。応答: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER 失敗、サーバ応答: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 失敗、サーバ応答: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -852,121 +853,123 @@ msgstr "" "プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。" "Acquire::ftp::ProxyLogin が空です。" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 失敗、サーバ応答: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "接続タイムアウト" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "読み込みエラー" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "レスポンスがバッファをオーバフローさせました。" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "書き込みエラー" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "ソケットを作成できません" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "失敗" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "パッシブソケットに接続できません。" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo はリスニングソケットを取得できませんでした" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "ソケットをバインドできませんでした" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "ソケットをリスンできませんでした" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "ソケットの名前を特定できませんでした" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "PORT コマンドを送信できません" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "未知のアドレスファミリ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT に失敗しました。サーバ応答: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "データソケット接続タイムアウト" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ファイルを取得できません。サーバ応答 '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "データソケットタイムアウト" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "データ転送に失敗しました。サーバ応答 '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "問い合わせ" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "呼び出せません" @@ -1002,7 +1005,7 @@ msgstr "%s:%s (%s) へ接続できませんでした。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" @@ -1032,23 +1035,23 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" msgid "Unable to connect to %s:%s:" msgstr "%s:%s へ接続できません:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ" "ていますか?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1057,161 +1060,161 @@ msgstr "" "クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク" "が必要?)" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "空のファイルは有効なアーカイブと認められません" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP サーバが不正なリプライヘッダを送信してきました" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "HTTP サーバのレンジサポートが壊れています" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "接続失敗" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "内部エラー" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB のアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1222,19 +1225,19 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "中断しました。" -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "続行しますか?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1242,19 +1245,19 @@ msgstr "" "いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "インストールを中断します。" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1265,16 +1268,16 @@ msgstr[0] "" "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n" "システムから消えました:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意: これは dpkg により自動でわざと行われれます。" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1292,15 +1295,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1309,7 +1312,7 @@ msgid_plural "" msgstr[0] "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1318,18 +1321,18 @@ msgstr[0] "" "%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ" "ん:\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1337,7 +1340,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1349,145 +1352,145 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "壊れたパッケージ" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告: 以下のパッケージは認証されていません!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "いくつかのパッケージを認証できませんでした" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "検証なしにこれらのパッケージをインストールしますか?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " または" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1495,27 +1498,27 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" @@ -1524,7 +1527,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除 #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[Y/n]" @@ -1532,92 +1535,92 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "依存関係を解決しています ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " 失敗しました。" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "依存関係を訂正できません" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "アップグレードセットを最小化できません" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " 完了" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" "ん。" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "完了" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1629,43 +1632,43 @@ msgstr "" " ロックが非アクティブであることから、今この時点の状態に妥当性が\n" " あるとは言い切れないことに注意してください!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s を %s に名前変更できませんでした" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "ヒット " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "取得:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "無視 " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "エラー " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%sB を %s で取得しました (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [処理中]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1678,19 +1681,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "%s へ変更することができません" @@ -1719,11 +1722,11 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません" msgid "[Mirror: %s]" msgstr "[ミラー: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" @@ -1761,7 +1764,7 @@ msgstr "が重要です。これを修正して「導入」を再度実行して msgid "Merging available information" msgstr "入手可能情報をマージしています" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1785,41 +1788,41 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "debconf のバージョンを取得できません。debconf はインストールされていますか?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "パッケージ拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "ディレクトリ %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "ソース拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Contents %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1900,26 +1903,26 @@ msgstr "" " -c=? 指定の設定ファイルを読む\n" " -o=? 任意の設定オプションを設定する" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "選択にマッチするものがありません" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB が古いため、%s のアップグレードを試みます" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1927,192 +1930,192 @@ msgstr "" "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" "ベースを削除し、再作成してください。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB ファイル %s を開くことができません: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "アーカイブにコントロールレコードがありません" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "カーソルを取得できません" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告: ディレクトリ %s が読めません\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告: %s の状態を取得できません\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "エラー: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "警告: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "エラー: エラーが適用されるファイルは " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s の解決に失敗しました" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "ツリー内での移動に失敗しました" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s のオープンに失敗しました" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " リンク %s [%s] を外します\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "%s のリンク読み取りに失敗しました" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "%s のリンク解除に失敗しました" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s を %s にリンクするのに失敗しました" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " リンクを外す制限の %sB に到達しました。\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - メモリの割り当てに失敗しました" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "'%s' をオープンできません" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "不正な override %s %llu 行目 #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "override ファイル %s を読み込むのに失敗しました" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "不正な override %s %llu 行目 #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "不正な override %s %llu 行目 #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "不正な override %s %llu 行目 #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' は未知の圧縮アルゴリズムです" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "圧縮出力 %s には圧縮セットが必要です" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "FILE* の作成に失敗しました" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "fork に失敗しました" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "圧縮子プロセス" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "内部エラー、%s の作成に失敗しました" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "MD5 の計算中に読み込みに失敗しました" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2164,158 +2167,158 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "パイプの生成に失敗しました" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "gzip の実行に失敗しました" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "壊れたアーカイブ" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "不正なアーカイブ署名" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "アーカイブメンバーヘッダの読み込みに失敗しました" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "不正なアーカイブメンバーヘッダ %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "不正なアーカイブメンバーヘッダ" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "アーカイブが不足しています" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "アーカイブヘッダの読み込みに失敗しました" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "リンクされているノードで DropNode が呼ばれました" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "ハッシュ要素を特定することができません!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "diversion の割り当てに失敗しました" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion での内部エラー" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "%s -> %s の diversion が二重に追加されています" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "設定ファイル %s/%s が重複しています" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "パス %s は長すぎます" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s を複数回展開しています" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "ディレクトリ %s は divert されています" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" "このパッケージは diversion のターゲットの %s/%s に書き込もうとしています" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "diversion パスが長すぎます" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "ハッシュバケツ内でノードを特定するのに失敗しました" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "パスが長すぎます" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s に対するバージョンのないパッケージマッチを上書きします" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s の状態を取得できません" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部エラー、メンバー %s を特定できません" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "解析できないコントロールファイル" @@ -2373,208 +2376,203 @@ msgstr "" "自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li日 %li時間 %li分 %li秒" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%li時間 %li分 %li秒" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%li分 %li秒" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%li秒" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "選択された %s が見つかりません" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "理解できない省略形式です: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "設定ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "文法エラー %s:%u: 不正なタグです" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "文法エラー %s:%u: ここからインクルードされています" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "文法エラー %s:%u: 未対応の命令 '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "文法エラー %s:%u: clear ディレクティブは、引数としてオプションツリーを必要と" "します" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... エラー!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完了" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "..." #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s... %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "コマンドラインオプション '%c' [%s から] は不明です。" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "コマンドラインオプション %s を理解できません" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "コマンドラインオプション %s は boolean ではありません" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "オプション %s には引数が必要です。" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "オプション %s には '%s' ではなく整数の引数が必要です" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "オプション '%s' は長すぎます" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s を解釈することができません。true か false を試してください。" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "不正な操作 %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "マウントポイント %s の状態を取得できません" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "CD-ROM の状態を取得するのに失敗しました" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "gzip ファイル %s のクローズ中に問題が発生しました" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "'%s' がディレクトリではないため、ファイルの一覧を作成できません" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2582,281 +2580,291 @@ msgstr "" "ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視" "します" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "子プロセス %s がシグナル %u を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "gzip ファイル %s のクローズ中に問題が発生しました" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "ファイルデスクリプタ %d を開けませんでした" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "子プロセス IPC の生成に失敗しました" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "以下の圧縮ツールの実行に失敗しました: " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "読み込みが %llu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "名前の変更に失敗しました。%s (%s -> %s)" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "%s にキーリングがインストールされていません。" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "空のパッケージキャッシュ" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "パッケージキャッシュファイルが壊れています" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "このパッケージキャッシュファイルは互換性がないバージョンです" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "パッケージキャッシュファイルが壊れています。短かすぎます" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "この APT はバージョニングシステム '%s' をサポートしていません" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "依存" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "先行依存" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "提案" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "推奨" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "競合" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "置換" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "廃止" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "破壊" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "拡張" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "要求" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "任意" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "特別" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "依存関係ツリーを作成しています" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "候補バージョン" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "依存関係の生成" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "状態情報を読み取っています" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "状態ファイル %s のオープンに失敗しました" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "一時状態ファイル %s の書き込みに失敗しました" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2865,12 +2873,12 @@ msgstr "" "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" "Immediate-Configure の項を参照してください。(%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' を設定できませんでした。" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2881,12 +2889,12 @@ msgstr "" "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "インデックスファイルのタイプ '%s' はサポートされていません" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2894,7 +2902,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2902,95 +2910,95 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "リストディレクトリ %spartial が見つかりません。" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "アーカイブディレクトリ %spartial が見つかりません。" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "ディレクトリ %s をロックできません" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "ファイルを取得しています %li/%li (残り %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "ファイルを取得しています %li/%li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "メソッドドライバ %s が見つかりません。" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ" "さい。" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "パッケージングシステム '%s' はサポートされていません" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "適切なパッケージシステムタイプを特定できません" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s の状態を取得できません。" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list に 'ソース' URI を指定する必要があります" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "パッケージリストまたはステータスファイルを解釈またはオープンすることができま" "せん。" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" "せん" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -2999,99 +3007,94 @@ msgstr "" "APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用でき" "ないため、無効です" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "不正なレコードがプリファレンスファイル %s に存在します。パッケージヘッダがあ" "りません" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "pin タイプ %s を理解できませんでした" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "pin で優先度 (または 0) が指定されていません" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "キャッシュに非互換なバージョニングシステムがあります" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s を処理中にエラーが発生しました (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "この APT が対応している以上の数のパッケージが指定されました。" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "この APT が対応している以上の数のバージョンが要求されました。" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "この APT が対応している以上の数の説明が要求されました。" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "この APT が対応している以上の数の依存関係が発生しました。" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "名前の変更に失敗しました。%s (%s -> %s)" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "サイズが適合しません" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "不正な操作 %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3100,16 +3103,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3118,14 +3121,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3135,12 +3138,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3149,12 +3152,12 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3162,67 +3165,67 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Release ファイル %s を解釈することができません" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Release ファイル %s にセクションがありません" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Release ファイル %s に Hash エントリがありません" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Release ファイル %s に無効な 'Date' エントリがあります" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "ベンダブロック %s は鍵指紋を含んでいません" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM マウントポイント %s を使用します\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM をアンマウントしています ...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "ディスクを待っています ...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM をマウントしています ...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "確認しています... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "格納されたラベル: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM をアンマウントしています ...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "ディスクのインデックスファイルを走査しています ...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3231,7 +3234,7 @@ msgstr "" "%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック" "ス、%zu の署名を見つけました\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3239,16 +3242,16 @@ msgstr "" "パッケージファイルを配置できません。Debian のディスクではないか、誤ったアーキ" "テクチャではないでしょうか?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "ラベル '%s' を見つけました\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "これは有効な名前ではありません。再試行してください。\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3257,34 +3260,34 @@ msgstr "" "このディスクは以下のように呼ばれます: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3301,37 +3304,37 @@ msgstr "認証レコードが見つかりません: %s" msgid "Hash mismatch for: %s" msgstr "ハッシュサムが適合しません: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "タスク '%s' が見つかりません" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3340,54 +3343,54 @@ msgstr "" "パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない" "ので選べません" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "インストールされていないので、パッケージ %s のインストール済みバージョンを選" "べません。" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "ソルバにシナリオを送信" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "ソルバにリクエストを送信" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "解決を受け取る準備" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "外部ソルバを実行" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "dpkg を実行しています" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3395,118 +3398,118 @@ msgstr "" "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" "るか、古いものが代わりに使われます。" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s をインストールしています" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s を削除しています" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s を完全に削除しています" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "%s の消失を記録しています" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "インストール後トリガ %s を実行しています" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "ディレクトリ '%s' が見つかりません" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "ファイル '%s' をオープンできませんでした" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s に書き込めません" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "操作はそれが完了する前に中断されました" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "MaxReports にすでに達しているため、レポートは書き込まれません" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "依存関係の問題 - 未設定のままにしています" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3514,7 +3517,7 @@ msgstr "" "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" "は書き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3522,7 +3525,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3530,7 +3533,7 @@ msgstr "" "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" "込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3539,14 +3542,14 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "エラーメッセージは dpkg I/O エラーであることを示しているので、レポートは書き" "込まれません。" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3555,7 +3558,7 @@ msgstr "" "管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい" "ませんか?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3563,7 +3566,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3571,7 +3574,7 @@ msgstr "" "dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま" "す。" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "ロックされていません" diff --git a/po/km.po b/po/km.po index f0bb75c19..bd43f3971 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,157 +20,157 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រ័យ​មិន​ត្រូវ​គ្នា ៖\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " កញ្ចប់​ធម្មតា ៖ " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " កញ្ចប់​និម្មិត​សុទ្ធ ៖ " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " កញ្ចប់​និម្មិត​តែ​មួយ ៖ " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " កញ្ចប់​និម្មិត​លាយ ៖ " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " បាត់បង់ ៖ " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "ភាព​អាស្រ័យ​សរុប ៖ " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "ទំហំ slack សរុប ៖" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "រក​កញ្ចប់​មិន​ឃើញ" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "ឯកសារ​កញ្ចប់ ៖" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ឃ្លាំង​សម្ងាត់​ឋិតនៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទេ" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(រក​មិន​ឃើញ)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " បាន​ដំឡើង ៖ " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " សាកល្បង ៖ " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(គ្មាន)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " ខ្ទាស់​កញ្ចប់ ៖ " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " តារាង​កំណែ ៖" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -243,29 +243,29 @@ msgstr "" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" "មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព័ត៌មាន​បន្ថែម​​មាន​ក្នុង​ទំព័រ​សៀវភៅដៃ​ ។\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​នេះ ឧទាហរណ៍​ដូចជា 'ដេបៀន 2.1r1 ថាស​ទី ១' ជាដើម" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។" @@ -301,65 +301,65 @@ msgstr "" " -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" @@ -379,114 +379,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,37 +495,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -610,7 +610,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" @@ -619,7 +619,7 @@ msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជា msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -632,53 +632,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -705,7 +705,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -753,173 +753,175 @@ msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូ msgid "Disk not found." msgstr "រក​ថាសមិ​ន​ឃើញ​ ។" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI មិនត្រឹមត្រូវ​ URIS មូលដ្ឋានមិនត្រូវ​ចាប់ផ្តើម​ជាមួយ​ // ឡើយ" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "កំពុង​ចូល​" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "មិន​អាច​កំណត់ឈ្មោះដែលត្រូវបង្ហាញ​បានឡើយ​" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "មិន​អាច​កំណត់ឈ្មោះមូលដ្ឋាន​បានឡើយ" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "ម៉ាស៊ីន​បម្រើបានបដិសេធ​ការតភ្ជាប់ ហើយ​ បាននិយាយ ៖ %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER បរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី​ត្រូវ​បាន​បញ្ជាក់​ ប៉ុន្តែ​គ្មាន​ស្គ្រីប​ចូល​ទេ Acquire::ftp::ProxyLogin គឺ ទទេ ។" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ '%s' បានបរាជ័យ ម៉ាស៊ីន​បម្រើ​បាននិយាយ ៖ %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "ការអាន​មានកំហុស" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន​​អស់ចំណុះ ។" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើយ" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "មិនអាចតភ្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្តាប់​​បានឡើយ" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "មិន​អាច​កំណត់​ឈ្មោះរបស់​រន្ធ​បានឡើយ" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន្នន័យ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "សំណួរ​" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "មិន​អាច​ហៅ​ " @@ -955,7 +957,7 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s" @@ -985,182 +987,182 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក msgid "Unable to connect to %s:%s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "កំពុង​រង់ចាំ​បឋមកថា" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "ជួរ​បឋមកថា​ខូច​" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសារ ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1171,20 +1173,20 @@ msgstr "" "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "បោះបង់ ។" -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 #, fuzzy msgid "Do you want to continue?" msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1192,19 +1194,19 @@ msgstr "" "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --" "fix- ដែលបាត់ឬ់ ?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1214,15 +1216,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1238,16 +1240,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1257,7 +1259,7 @@ msgid_plural "" msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1265,24 +1267,24 @@ msgid_plural "" msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1294,146 +1296,146 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 #, fuzzy msgid "Install these packages without verification?" msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? " -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ឬ" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយ​សារតែ​ %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1441,27 +1443,27 @@ msgstr "" "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu ​ត្រូវបានបន្ទាប់ " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" @@ -1470,7 +1472,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1478,91 +1480,91 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " បាន​បរាជ័យ ។" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " ធ្វើ​រួច" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "ធ្វើរួច​" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1570,43 +1572,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "វាយ​" -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "យក​ ៖" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [កំពុង​ធ្វើការ​]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1619,19 +1621,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "មិន​អាច​អាន​ %s បានឡើយ" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ" @@ -1660,11 +1662,11 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល" @@ -1704,7 +1706,7 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន msgid "Merging available information" msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1728,40 +1730,40 @@ msgstr "" " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "មិន​អាច​សរសេរ​ទៅ %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "​កំហុស​ដំណើរការ​ថត​ %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1842,26 +1844,26 @@ msgstr "" " -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1870,192 +1872,192 @@ msgstr "" "ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​" "មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W ៖ មិន​អាច​ថ្លែង %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "មែក​ធាង បាន​បរាជ័យ" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "មិន​អាចបើក​ %s បានឡើយ" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "បង្ហាប់កូន" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2108,157 +2110,157 @@ msgstr "" " -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "ប័ណ្ណសារ​បាន​ខូច​" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "ប័ណ្ណសារ ខ្លីពេក" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "ផ្លូវ​ %s វែង​ពេក" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "ថត​ %s ត្រូវបាន​បង្វែរ" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "ផ្លូវ​បង្វែរ វែងពេក" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "ផ្លូវ​វែង​ពេក" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "មិន​អាច​ថ្លែង %s បានឡើយ" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន" @@ -2316,495 +2318,500 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... កំហុស ​!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... ធ្វើរួច​" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... ធ្វើរួច​" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាត់​ពាក្យ​បញ្ជា %s ឡើយ" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន =<val> មួយ ។" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "ជម្រើស​ '%s' វែងពេក" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "អាស្រ័យ​" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "អាស្រ័យជា​មុន" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "ផ្ដល់យោបល់​" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "ផ្តល់​អនុសាសន៍​" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "ប៉ះទង្គិច" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "ជំនួស​" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "លែង​ប្រើ" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "សំខាន់​" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "បាន​ទាមទារ" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "គំរូ" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "ស្រេចចិត្ត" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "បន្ថែម" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "កំណែ​សាកល្បង​" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "ការបង្កើត​ភាពអាស្រ័យ​" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "កំពុង​បើក​ %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2815,18 +2822,18 @@ msgstr "" "ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::" "Force-LoopBreak សកម្ម ។" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2834,215 +2841,210 @@ msgstr "" "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" "ដែលបាន​ទុក ។" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3050,12 +3052,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3064,101 +3066,101 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "កំពុង​រង់ចាំឌីស​...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "បានទុក​ស្លាក ៖ %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i លិបិក្រម​ប្រភព%i និង ហត្ថលេខា %i \n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "បានទុក​ស្លាក ៖ %s \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "នោះមិនមែនជាឈ្មោះត្រឹមត្រូវទេ សូមព្យាយាម​ម្ដងទៀត ។\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3167,34 +3169,34 @@ msgstr "" "ឌីស​នេះ​ត្រូវ​បាន​ហៅ​ ៖ \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" @@ -3209,88 +3211,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3298,167 +3300,167 @@ msgid "" msgstr "" "ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "កំពុង​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "កំពុងរៀបចំ​ %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "កំពុង​ស្រាយ %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "បាន​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "មិន​អាច​សរសេរ​ទៅ %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/ko.po b/po/ko.po index 8b7f9ca86..be87181c2 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -15,153 +15,153 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "전체 패키지 이름 : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "전체 패키지 구조: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " 일반 패키지: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " 순수 가상 패키지: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " 단일 가상 패키지: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " 혼합 가상 패키지: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " 빠짐: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "개별 버전 전체: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "개별 설명 전체: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "전체 의존성: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "전체 버전/파일 관계: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "전체 설명/파일 관계: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "전체 제공 매핑: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "전체 패턴 문자열: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "전체 의존성 버전 용량: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "전체 빈 용량: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "차지하는 전체 용량: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "패키지가 없습니다" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "최소 한 개의 검색어를 지정해야 합니다" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "패키지 파일:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "핀 패키지:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(없음)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " 설치: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " 후보: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(없음)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " 패키지 핀: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -235,28 +235,28 @@ msgstr "" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오." @@ -292,65 +292,65 @@ msgstr "" " -c=? 해당 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다." -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 패키지는 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "다운로드 디렉터리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" @@ -375,95 +375,95 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -472,7 +472,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -481,14 +481,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: 설치한 %3$s 패키지가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -497,7 +497,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -506,30 +506,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -617,7 +617,7 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" @@ -626,7 +626,7 @@ msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -639,53 +639,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "하지만 설치하지 않았습니다" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s 패키지는 수동설치로 지정합니다.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "%s 파일을 여는데 실패했습니다" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -712,7 +712,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -760,52 +760,52 @@ msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 msgid "Disk not found." msgstr "디스크가 없습니다." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다." #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "로그인하는 중입니다" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "상대방의 이름을 알 수 없습니다" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "로컬 이름을 알 수 없습니다" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "서버에서 다음과 같이 연결을 거부했습니다: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER 실패, 서버에서는: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 실패, 서버에서는: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -813,121 +813,123 @@ msgstr "" "프록시 서버를 지정했지만 로그인 스크립트가 없습니다. Acquire::ftp::" "ProxyLogin 값이 비어 있습니다." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 실패, 서버에서는: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "연결 시간 초과" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "읽기 오류" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "응답이 버퍼 크기를 넘어갔습니다." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "쓰기 오류" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "소켓을 만들 수 없습니다" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "실패" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "수동(passive) 소켓을 연결할 수 없습니다." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "소켓을 bind할 수 없습니다" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "소켓에 listen할 수 없습니다" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "소켓의 이름을 알아낼 수 없습니다" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "PORT 명령을 보낼 수 없습니다" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 실패, 서버에서는: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "데이터 소켓 연결 시간 초과" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "데이터 소켓에 제한 시간이 초과했습니다" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "데이터 전송 실패, 서버에서는: %s" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "질의" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " @@ -963,7 +965,7 @@ msgstr "%s:%s에 연결할 수 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" @@ -993,131 +995,131 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생 msgid "Unable to connect to %s:%s:" msgstr "%s:%s에 연결할 수 없습니다:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "해당 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "서버에서 읽는데 오류가 발생했습니다" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "출력 파일에 쓰는데 오류가 발생했습니다" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "내부 오류" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십" @@ -1125,42 +1127,42 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " @@ -1169,11 +1171,11 @@ msgstr "" # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1184,19 +1186,19 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "중단." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "계속 하시겠습니까?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "일부 파일을 받는데 실패했습니다" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1204,19 +1206,19 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "빠진 패키지를 바로잡을 수 없습니다." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "설치를 중단합니다." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1227,15 +1229,15 @@ msgstr[0] "" "다음 패키지는 패키지의 파일을 모두 다른 패키지가\n" "덮어썼기 때문에 사라졌습니다:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1253,15 +1255,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1269,25 +1271,25 @@ msgid_plural "" "required:" msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1295,7 +1297,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1306,145 +1308,145 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "망가진 패키지" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "추천하는 패키지:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 패키지를 인증할 수 없습니다!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "인증 경고를 무시합니다.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 패키지가 있습니다" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "확인하지 않고 패키지를 설치하시겠습니까?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [설치함]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [설치함]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [설치함]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [설치함]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " 혹은" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1452,27 +1454,27 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" @@ -1481,7 +1483,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[Y/n]" @@ -1489,91 +1491,91 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " 실패." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " 완료" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "완료" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1585,43 +1587,43 @@ msgstr "" " 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n" " 않도록 하십시오!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "기존 " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "받기:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "무시" -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "오류 " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "내려받기 %s바이트, 소요시간 %s (%s바이트/초)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [작업중]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1634,19 +1636,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" @@ -1675,11 +1677,11 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" @@ -1718,7 +1720,7 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 msgid "Merging available information" msgstr "이용 가능 패키지 정보를 합칩니다" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1742,40 +1744,40 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "패키지 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "소스 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1856,26 +1858,26 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "맞는 패키지가 없습니다" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1883,194 +1885,194 @@ msgstr "" "DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 " "지우고 다시 만드십시오." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는데 실패했습니다" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "아카이브에 컨트롤 기록이 없습니다" # FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "경고: %s의 정보를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "오류: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "경고: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s의 경로를 알아내는데 실패했습니다" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "트리에서 이동이 실패했습니다" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s 파일을 여는데 실패했습니다" # FIXME: ?? -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " 링크 %s [%s] 없애기\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "%s 파일에 readlink하는데 실패했습니다" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "%s 파일을 지우는데 실패했습니다" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "아카이브에 패키지 필드가 없습니다" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - 메모리를 할당하는데 실패했습니다" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s 열 수 없습니다" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "%s override 파일을 읽는데 실패했습니다" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' 압축 알고리즘을 알 수 없습니다" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "FILE*를 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "fork하는데 실패했습니다" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "압축 하위 프로세스" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "내부 오류, %s 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2124,157 +2126,157 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "파이프 만들기가 실패했습니다" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "gzip 실행이 실패했습니다" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "아카이브 서명이 틀렸습니다" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "아카이브 멤버 헤더를 읽는데 오류가 발생했습니다" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "아카이브 멤버 헤더가 잘못되었습니다" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "아카이브 길이가 너무 짧습니다" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "아카이브 헤더를 읽는데 실패했습니다" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "해시 항목을 찾는데 실패했습니다" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "diversion을 할당하는데 실패했습니다" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion에서 내부 오류" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s 파일을 쓰는데 실패했습니다" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는데 실패했습니다" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "경로 %s이(가) 너무 깁니다" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s을(를) 두 번 이상 풀었습니다" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "%s 디렉터리가 전환되었습니다" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "전환하는 경로가 너무 깁니다" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "해시 버킷에서 노드를 찾는데 실패했습니다" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "경로가 너무 깁니다" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s의 정보를 읽을 수 없습니다" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "내부 오류, %s 멤버를 찾을 수 없습니다" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "control 파일을 파싱할 수 없습니다" @@ -2332,483 +2334,488 @@ msgstr "" "mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li일 %li시간 %li분 %li초" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%li시간 %li분 %li초" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%li분 %li초" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%li초" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "문법 오류 %s:%u: 여기서 include됩니다" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "문법 오류 %s:%u: clear 지시어는 인수로 option 트리를 지정해야 합니다" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 오류!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... 완료" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... 완료" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "%s 옵션에는 인수가 필요합니다." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s 옵션에는 정수 인수가 필요합니다. '%s'이(가) 아닙니다" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "'%s' 옵션이 너무 깁니다" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "잘못된 작업 %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "%s gzip 파일을 닫는데 문제가 있습니다" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "%s gzip 파일을 닫는데 문제가 있습니다" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "%d 파일 디스크립터를 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "하위 프로세스 IPC를 만드는데 실패했습니다" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "%s 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "%s 파일을 삭제하는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "%s에 키 모음을 설치하지 않았습니다." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "패키지 캐시가 비어 있습니다" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "패키지 캐시 파일이 손상되었습니다" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "패키지 캐시 파일이 손상되었습니다" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "패키지 캐시가 다른 아키텍쳐용입니다." -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "의존" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "미리의존" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "제안" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "추천" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "충돌" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "대체" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "없앰" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "망가뜨림" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "향상" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "중요" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "필수" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "표준" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "옵션" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "별도" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "의존성 트리를 만드는 중입니다" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "후보 버전" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "의존성 만들기" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "상태 정보를 읽는 중입니다" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "상태파일 %s 여는데 실패했습니다" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "임시 상태파일 %s 쓰는데 실패했습니다" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2817,12 +2824,12 @@ msgstr "" "'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에" "서 APT::Immediate-Configure 항목을 보십시오. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2833,19 +2840,19 @@ msgstr "" "잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 " "APT::Force-LoopBreak 옵션을 켜십시오." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2853,214 +2860,209 @@ msgstr "" "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "목록 디렉터리 %spartial이 빠졌습니다." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "아카이브 디렉터리 %spartial이 빠졌습니다." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "%s 디렉터리를 잠글 수 없습니다" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "파일 받아오는 중: %2$li 중 %1$li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' 패키지 시스템을 지원하지 않습니다" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s의 정보를 읽을 수 없습니다." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list에 '소스' URI를 써 넣어야 합니다" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "캐시의 버전 시스템이 호환되지 않습니다" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "패키지 목록을 읽는 중입니다" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "해시 합이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "잘못된 작업 %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3070,12 +3072,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3084,86 +3086,86 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Release 파일 %s에 섹션이 없습니다" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Release 파일 %s에 Hash 항목이 없습니다" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "알아보는 중입니다... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "저장된 레이블: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3171,16 +3173,16 @@ msgstr "" "패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘" "못된 것 같습니다?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "레이블 발견: %s \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3189,34 +3191,34 @@ msgstr "" "이 디스크는 다음과 같습니다: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "패키지 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" @@ -3231,37 +3233,37 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s" msgid "Hash mismatch for: %s" msgstr "다음의 해시가 다릅니다: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' 작업을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3270,51 +3272,51 @@ msgstr "" "'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니" "다." -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다." -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다." -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다." -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "dpkg 실행하는 중입니다" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3323,118 +3325,118 @@ msgstr "" "일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거" "의 버전을 대신 사용합니다." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s 설치하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s 설정 중입니다" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s 패키지를 지우는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s 패키지를 완전히 지우는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "%s 사라짐 발견했습니다" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "설치 후 트리거 %s 실행하는 중입니다" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "디렉터리 '%s' 없습니다." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s 준비 중입니다" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "%s 패키지를 설정할 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s 설치" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "%s 패키지를 지울 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s 패키지를 완전히 지웠습니다" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s에 쓸 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3442,20 +3444,20 @@ msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" "적인 오류입니다." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3463,13 +3465,13 @@ msgid "" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 dpkg 입출력 오류입니다." -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3478,21 +3480,21 @@ msgstr "" "관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니" "까?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" "dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "잠기지 않음" diff --git a/po/ku.po b/po/ku.po index 078e0e745..c39eea170 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,157 +19,157 @@ msgstr "" "X-Generator: KAider 0.1\n" "Plural-Forms: nplurals=2; plural= n != 1;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Navên paketan bi giştî :" -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Navên paketan bi giştî :" -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Pakêtên normal:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Pakêtên farazî yên safî:" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pakêta tenê ya farazî:" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Pakêtên hevbeş yên farazî:" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Winda: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Guhertoyên vekirî yên giştî:" -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "Guhertoyên vekirî yên giştî:" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Bindestên giştî:" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "Guhertoyên vekirî yên giştî:" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Cihê giştî yê sist:" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Cihê giştî yê veqetandî: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Pakêta dosya %s li derveyî demê ye." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Pakêt nayên dîtin" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "Pêwist e tu mînakekê bidî" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Pakêt nehate dîtin %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Pelgehên Pakêt:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nehate dîtin)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Sazkirî: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Berendam: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ne tiştek)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Destika pakêtê:" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabloya guhertoyan:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -206,29 +206,29 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -264,65 +264,65 @@ msgstr "" " -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. " "mînak -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "" @@ -342,151 +342,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -532,7 +532,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 msgid "Must specify at least one pair url/filename" msgstr "" @@ -540,7 +540,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -553,53 +553,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "lê ne sazkirî ye" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "%s venebû" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -626,7 +626,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -672,173 +672,175 @@ msgstr "" msgid "Disk not found." msgstr "Dîsk nehate dîtin." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Pel nehate dîtin" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Têketin" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Nikare navê herêmî tesbît bike" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Çewiya xwendinê" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Çewtiya nivîsînê" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Serneket" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, fuzzy, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Danegira %s nehate vekirin: %s" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Lêpirsîn" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 #, fuzzy msgid "Unable to invoke " msgstr "%s venebû" @@ -875,7 +877,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Bi %s re tê girêdan" @@ -905,183 +907,183 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "" -#: methods/http.cc:656 +#: methods/http.cc:648 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Çewtiya hundirîn" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Anîna %sB ji arşîvan pêwist e.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Cihê vala li %s têre nake." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Erê, wusa bike!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1089,37 +1091,37 @@ msgid "" " ?] " msgstr "" -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Betal." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Dixwazî bidomînî?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Daxistina çend pelan biserneket" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Sazkirin tê betalkirin." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1129,15 +1131,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1153,15 +1155,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1171,7 +1173,7 @@ msgid_plural "" msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:" msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1179,23 +1181,23 @@ msgid_plural "" msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:" msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1203,171 +1205,171 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Paketên şikestî" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " û" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1376,7 +1378,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 #, fuzzy msgid "[Y/n]" msgstr "[E/n]" @@ -1385,90 +1387,90 @@ msgstr "[E/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Bindestî tên serrastkirin..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " neserketî." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Nikare bindestiyan rast kirin" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Temam" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 msgid "Internal error, Upgrade broke stuff" msgstr "" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Temam" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1476,43 +1478,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s ji hev nehate veçirandin" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "" -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Anîn:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "" -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Çewt" -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, fuzzy, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s hatine anîn..." -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Dixebite]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1522,19 +1524,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Nikare %s bixwîne" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nikarî derbasa %s bike" @@ -1563,11 +1565,11 @@ msgstr "Nikarî pelê %s veke" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Girêdan zû hatiye girtin" @@ -1605,7 +1607,7 @@ msgstr "" msgid "Merging available information" msgstr "" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1619,40 +1621,40 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Di şixulandina pêrista %s de çewtî" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Dema şixulandina naveroka %s çewtî" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1694,217 +1696,217 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Danegira %s nehate vekirin: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Tomara kontrola arşîvê tuneye" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: pelrêça %s nayê xwendin\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s ji hev nehate veçirandin" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s venebû" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Di arşîvê de qada pakêtê tuneye" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s venebû" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, c-format msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -1949,160 +1951,160 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 #, fuzzy msgid "Failed to create pipes" msgstr "%s ji hev nehate veçirandin" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Xebitandina gzip biserneket" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arşîv zêde kin e" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 #, fuzzy msgid "Failed to allocate diversion" msgstr "%s venebû" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Nivîsîna pelê %s biserneket" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Girtina pelê %s biserneket" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Rêça %s zêde dirêj e" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 #, fuzzy msgid "The diversion path is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Rêç zêde dirêj e" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, fuzzy, c-format msgid "Unable to stat %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "" @@ -2160,493 +2162,498 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Hilbijartina %s nehatiye dîtin" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Çewtî!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Çêbû" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Çêbû" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opsiyona '%s' zêde dirêj e" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, fuzzy, c-format msgid "Unable to stat the mount point %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Di girtina pelî de pirsgirêkek derket" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Di girtina pelî de pirsgirêkek derket" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "nav guherandin biserneket, %s (%s -> %s)" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Sazkirin tê betalkirin." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Bindest" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "PêşBindest" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Pêşniyaz dike" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Tawsiye dike" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Nakokî" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Dikeve şunve" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Kevin dike" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Dişkîne" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "girîng" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "pêwist" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opsiyonel" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ekstra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Guhartoyên berendam" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Vekirina StateFile %s biserneket" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "%s ji hev nehate veçirandin" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, fuzzy, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, fuzzy, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nikarî pelê %s veke" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2654,229 +2661,224 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Peldanka '%s' kêm e" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Peldanka '%s' kêm e" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "W: pelrêça %s nayê xwendin\n" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Pel tê anîn %li ji %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, c-format msgid "Is the package %s installed?" msgstr "" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, fuzzy, c-format msgid "Unable to stat %s." msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Dema şixulandina naveroka %s çewtî" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Lîsteya pakêtan tê xwendin" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "nav guherandin biserneket, %s (%s -> %s)" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hash Sum li hev nayên" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Mezinahî li hev nayên" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2884,112 +2886,112 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "" -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Etîketa '%s' hatiye dîtin\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -2998,34 +3000,34 @@ msgstr "" "Navê dîskê: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Lîsteyên pakêtan tên jibergirtin..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i tomar hatin nivîsîn.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3040,254 +3042,254 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum li hev nayên" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Peywira %s nehate dîtin" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nikarî pakêta %s bibîne" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Nikarî pakêta %s bibîne" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s tê mîhengkirin" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s tê rakirin" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "%s bi tevahî hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Peldanka '%s' kêm e" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nikarî pelê %s veke" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s tê derxistin" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Mîhengkirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Bi tevahî rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s bi tevahî hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Pelrêça daxistinê nayê quflekirin" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/lt.po b/po/lt.po index 362c69c58..b1bf64a8f 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -18,156 +18,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 #, fuzzy msgid "Total package names: " msgstr "Visi paketų pavadinimai: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Visi paketų pavadinimai: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normalūs paketai: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Virtualūs paketai: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pavieniai virtualūs paketai: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Mišrūs virtualūs paketai: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Trūksta: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Viso skirtingų versijų: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "Viso skirtingų aprašymų: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Viso priklausomybių: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Viso versijų/failų santykių yra: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Viso aprašymų/failų santykių yra: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Paketų nerasta" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Paketų failai:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Surišti paketai:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nerasta)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Įdiegta: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidatas: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(nėra)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Paketo susiejimai: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versijų lentelė:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -204,28 +204,28 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Prašome įdėti diską į įrenginį ir paspausti Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nepavyko pervadinti %s į %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje." @@ -261,65 +261,65 @@ msgstr "" " -c=? Nuskaityti pateiktą konfigūracijos failą\n" " -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" @@ -339,95 +339,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -435,7 +435,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -443,14 +443,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -459,7 +459,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -467,30 +467,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -536,7 +536,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" @@ -545,7 +545,7 @@ msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekst msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -558,53 +558,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "bet jis nėra įdiegtas" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s ir taip jau yra naujausias.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s ir taip jau yra naujausias.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Nepavyko atverti %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -631,7 +631,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -677,172 +677,174 @@ msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbūt jis vis dar naudojamas. msgid "Disk not found." msgstr "Diskas nerastas." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Failas nerastas" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Jungiamasi" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Jungiamasi per ilgai" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Skaitymo klaida" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Rašymo klaida" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Nepavyko" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Užklausti" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "" @@ -878,7 +880,7 @@ msgstr "Nepavyko prisijungti prie %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Jungiamasi prie %s" @@ -908,181 +910,181 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Laukiama antraščių" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Vidinė klaida" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "Keista... Dydis neatitinka, Parašykite laišką apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Reikia parsiųsti %sB/%sB archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Reikia parsiųsti %sB archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "%s nėra pakankamai laisvos vietos." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Taip, daryk kaip liepiu!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1093,19 +1095,19 @@ msgstr "" "Jei norite tęsti, įveskite frazę „%s“\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Nutraukti." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Ar norite tęsti?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Nepavyko parsiųsti kai kurių failų" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1113,19 +1115,19 @@ msgstr "" "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ " "arba pabandykite su parametru --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Nepavyko pataisyti dingusių paketų." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Diegimas nutraukiamas." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1135,15 +1137,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1159,15 +1161,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1177,7 +1179,7 @@ msgid_plural "" msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1185,18 +1187,18 @@ msgid_plural "" msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1204,7 +1206,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1216,145 +1218,145 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Sugadinti paketai" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Nepavyko autentikuoti kai kurių paketų" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Įdiegti šiuos paketus be patvirtinimo?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " arba" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1362,27 +1364,27 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" @@ -1391,7 +1393,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[T/n]" @@ -1399,92 +1401,92 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Taisomos priklausomybės..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " nepavyko." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Nepavyko patenkinti priklausomybių" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 #, fuzzy msgid "Unable to minimize the upgrade set" msgstr "Nepavyko minimizuoti atnaujinimo rinkinio" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Įvykdyta" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Įvykdyta" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1492,43 +1494,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nepavyko pervadinti %s į %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Imamas " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Gauti:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ignoruotas " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Klaida " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Parsiųsta %sB iš %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Vykdoma]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1541,19 +1543,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Nepavyko perskaityti %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nepavyko pakeisti į %s" @@ -1582,11 +1584,11 @@ msgstr "Nepavyko atverti failo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Nepavyko subprocesui sukurti IPC gijos" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "" @@ -1630,7 +1632,7 @@ msgstr "" msgid "Merging available information" msgstr "Sujungiama turima informaija" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1655,40 +1657,40 @@ msgstr "" " -c=? Nuskaityti šį konfigūracijų failą\n" " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Nepavyko įrašyti į %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Paketo plėtinių sąrašas yra per ilgas" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Klaida apdorojant aplanką %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Šaltinio plėtinys yra per ilgas" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Klaida įrašant antraštę į turinio failą" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Klaida apdorojant turinį %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1774,26 +1776,26 @@ msgstr "" " -c=? Perskaityti šį nuostatų failą\n" " -o=? Nustatyti savarankišką konfigūracijos nuostatą" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nėra atitikmenų" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Kai kurių failų nėra paketų grupėje „%s“" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1802,192 +1804,192 @@ msgstr "" "Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės " "versijos, prašome pašalinkite ir perkurkite duomenų bazę." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nepavyko atverti DB failo %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Nepavyko patikrinti %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Į: Nepavyko perskaityti aplanko %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "Į: Nepavyko patikrinti %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "K: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "Į: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "K: Klaidos failui " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Nepavyko išspręsti %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Judesys medyje nepavyko" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Nepavyko atverti %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Nepavyko nuskaityti nuorodos %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Nepavyko atsieti nuorodos %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nepavyko susieti %s su %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Archyvas neturėjo paketo lauko" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s neturi perrašymo įrašo\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s prižiūrėtojas yra %s, o ne %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nepavyko išskirti atminties" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nepavyko atverti %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nepavyko nuskaityti perrašymo failo %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Nežinomas suspaudimo algoritmas „%s“" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Nepavyko sukurti FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Vidinė klaida, nepavyko sukurti %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Nepavyko Nusk/Įraš į subprocesą/failą" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Skaitymo klaida skaičiuojant MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Nepavyko pervadinti %s į %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2042,157 +2044,157 @@ msgstr "" " -c=? Nuskaityti šią konfigūracijos bylą\n" " -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Sugadintas archyvas" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nežinomas TAR antraštės tipas %u. narys %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Archyvas per trumpas" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Nepavyko perskaityti archyvo antraščių" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Kelias %s per ilgas" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Kelias per ilgas" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vidinė klaida, nepavyko aptikti nario %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "" @@ -2250,493 +2252,498 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Klaida!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Baigta" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Baigta" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Parametrui %s reikia argumento." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Klaida užveriant failą" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Nepavyko atverti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Nepavyko rezervuoti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Procesas %s grąžino klaidos kodą (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Procesas %s netikėtai išėjo" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Klaida užveriant failą" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Nepavyko sukurti subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Nepavyko paleisti suspaudėjo " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Diegimas nutraukiamas." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Priklauso" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Priešpriklauso" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Siūlo" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Rekomenduoja" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Konfliktuoja" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Pakeičia" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Pakeičia" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Sugadina" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "Svarbu" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "privaloma" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standartinis" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "nebūtinas" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "papildomas" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Konstruojamas priklausomybių medis" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Galimos versijos" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Priklausomybių generavimas" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Skaitoma būsenos informacija" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Atveriama %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nepavyko atverti failo %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2744,232 +2751,227 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Trūksta aplanko „%s“" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Trūksta aplanko „%s“" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Nepavyko užrakinti sąrašo aplanko" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Parsiunčiamas %li failas iš %li (liko %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Parsiunčiamas %li failas iš %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Nepavyko perskaityti arba atverti paketų sąrašo arba būklės failo." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų " "ištaisytos" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Nepavyko perskaityti šaltinių sąrašo." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Klaida apdorojant turinį %s" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Skaitomi paketų sąrašai" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Neatitinka dydžiai" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2977,112 +2979,112 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Pastaba: pažymimas %s vietoje %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Pastaba: pažymimas %s vietoje %s\n" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Naudojama CD-ROM prijungimo vieta %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Atjungiamas CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Laukiama disko...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Prijungiamas CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identifikuojama... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Atjungiamas CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Rasta žymė „%s“\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3091,34 +3093,34 @@ msgstr "" "Šio disko pavadinimas: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopijuojami paketų sąrašai..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Rašomas naujas šaltinių sąrašas\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3133,88 +3135,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebuvo rasta „%s“ versija paketui „%s“" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nepavyko rasti užduoties %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nepavyko rasti paketo %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Nepavyko rasti paketo %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3223,167 +3225,167 @@ msgstr "" "Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje " "jų panaudoti seni." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Konfigūruojamas %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Šalinamas %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Visiškai pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Trūksta aplanko „%s“" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Ruošiamas %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Išpakuojamas %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Ruošiamasi konfigūruoti %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Ruošiamasi %s pašalinimui" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Ruošiamasi visiškai pašalinti %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Visiškai pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nepavyko įrašyti į %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Nepavyko užrakinti sąrašo aplanko" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/mr.po b/po/mr.po index c66fc52ac..640dbdd15 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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 " @@ -16,155 +16,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "पॅकेज %s आवृती %s मध्ये एक अनोळखी डीईपी:आहे\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "पॅकेजची सर्व नांवे: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "पॅकेजची सर्व नांवे: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " सामान्य पॅकेजेस्: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " शुध्द आभासी पॅकेजेस्:" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " एकमेव आभासी पॅकेजेस्:" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr "मिश्रित आभासी पॅकेजेस्:" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " हरवलेले/गहाळ: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "एकूण स्पष्ट आवृत्या: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "एकूण स्पष्ट विवरणे: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "एकूण निर्भरता:" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "एकूण विव/संचिका परस्पर संबंध:" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "एकूण मॅपींगस् तरतूद: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "एकूण एकत्रित अक्षरसंच:" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "एकूण परावलंबित आवृत्ती अवकाश:" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "एकूण दुर्लक्षित अवकाश:" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "पॅकेजेस सापडले नाहीत" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "पॅकेज %s शोधण्यास असमर्थ आहे" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "पॅकेज संचिका:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "एकत्रित पॅकेजेस:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(मिळाले नाही)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr "अधिष्ठापित केले:" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr "उमेदवार:" -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(कोणताच नाही)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr "पॅकेज (पिन):" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr "आवृत्ती कोष्टक:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -237,29 +237,29 @@ msgstr "" "-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n" "अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन्युअल पृष्ठे पहा \n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "या तबकडीला कृपया नाव द्या जसे डेबियन २ एलआरएल तबकडी १" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)" @@ -295,65 +295,65 @@ msgstr "" " -c= ? ही संरचना संचिका वाचा \n" " -o=? एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" @@ -373,114 +373,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -489,37 +489,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -606,7 +606,7 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" @@ -615,7 +615,7 @@ msgstr "उगम शोधण्यासाठी किमान एक प msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -628,53 +628,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "पण ते संस्थापित केले नाही" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "%s उघडण्यास असमर्थ" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -701,7 +701,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -749,52 +749,52 @@ msgstr "%s मधील सीडी-रॉम अनमाऊंट करण msgid "Disk not found." msgstr "डिस्क सापडत नाही" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "फाईल सापडली नाही" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "लॉग इन करत आहे" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "पिअर नाव सांगण्यास/सापडण्यास असमर्थ" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "स्थानिक नाव सांगण्यास असमर्थ" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "सर्व्हर ने संबंध जोडण्यास नकार दिला व सांगितले: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "सर्व्हरने %s सांगितले,यूजर असमर्थ:" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -802,121 +802,123 @@ msgstr "" "प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन " "निरर्थक आहे." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "सर्व्हरने %s सांगितले, '%s' लॉग इन स्क्रिप्ट आज्ञावली असमर्थ:" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "वेळेअभावी संबंध जोडता येत नाही" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "त्रुटी वाचा" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "प्रतिसाधाने बफर भरुन गेले." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "लिहिण्यात त्रुटी" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "सॉकेट तयार करू शकत नाही" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "असमर्थ" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "पॅसिव्ह सॉकेट जोडता येत नाही" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "सॉकेट चिकटवता येत नाही" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "सॉकेट वर ऐकता येत नाही" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "सॉकेटचे नाव सांगता येत नाही" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा पाठविण्यास असमर्थ" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "डेटा सॉकेट वेळेअभावी तुटले" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "प्रश्न" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "जारी करण्यास करण्यास असमर्थ" @@ -952,7 +954,7 @@ msgstr "%s:%s (%s) ला जोडू शकत नाही" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "%s ला जोडत आहे" @@ -982,183 +984,183 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "शीर्षकासाठी थांबले आहे...." -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "वाईट शीर्षक ओळ" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले " -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "अंतर्गत त्रुटी" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "अर्काईव्हजच्या %sB/%sB घेण्याची गरज आहे\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "अर्काईव्हज%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "या क्रियेनंतर, %sB एवढी अधिक डिस्क जागा वापरली जाईल.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "हो, मी म्ह्टल्याप्रमाणे करा!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1169,20 +1171,20 @@ msgstr "" "पुढे '%s' उक्ती मध्ये लिहिणार \n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "व्यत्यय/बंद करा." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 #, fuzzy msgid "Do you want to continue?" msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1190,20 +1192,20 @@ msgstr "" "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- " "बरोबर प्रयत्न कराहरवलेले/गहाळ?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "संस्थापन खंडित करत आहे." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1213,15 +1215,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1239,15 +1241,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1257,7 +1259,7 @@ msgid_plural "" msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1265,20 +1267,20 @@ msgid_plural "" msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1286,7 +1288,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1298,146 +1300,146 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! " -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 #, fuzzy msgid "Install these packages without verification?" msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr "किंवा" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1445,27 +1447,27 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" @@ -1474,7 +1476,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1482,91 +1484,91 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "होय" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr "अयशस्वी/चूकीचे झाले." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे " -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr "झाले" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा " -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "झाले" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1574,43 +1576,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "दाबा" -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "मिळवा:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "आय.जी.एन." -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "दोष इ.आर.आर." -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s (%sB/s) मध्ये %sB मिळविला\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr "[काम करत आहे]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1623,19 +1625,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s वाचण्यास असमर्थ" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "%s मध्ये बदलण्यास असमर्थ" @@ -1664,11 +1666,11 @@ msgstr "%s फाईल उघडता येत नाही" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "जोडणी अकाली बंद झाली" @@ -1709,7 +1711,7 @@ msgstr "" msgid "Merging available information" msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1733,40 +1735,40 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s " -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "त्रुटी प्रक्रिया मजकूर %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1847,26 +1849,26 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "निवडक भाग जुळत नाही" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1875,192 +1877,192 @@ msgstr "" "DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " "कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "%s: %s DB संचिका उघडण्यास असमर्थ" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s स्टेट करण्यास असमर्थ" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "संकेतक घेण्यास असमर्थ" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E:" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "धो.सू.:" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "ई: संचिकेला लागू होणाऱ्या चुका" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s सोडवण्यास असमर्थ" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "ट्री चालणे असमर्थ" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s उघडण्यास असमर्थ" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "%s [%s] डी दुवा\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "%s वाचणारा दुवा असमर्थ" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "%s दुवा काढण्यास असमर्थ" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "%s चा %s दुवा साधण्यास असमर्थ" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "%sB हीट ची डिलींक मर्यादा\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "अर्काईव्ह ला पॅकेज जागा नाही" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s उघडण्यास असमर्थ" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "संचिका * तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "IO ची उपक्रिया/संचिका असमर्थ " -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2114,157 +2116,157 @@ msgstr "" " -c=? ही संरचना फाईल वाचा\n" " -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "पाईप तयार करण्यास असमर्थ" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "exec gzip करण्यास असमर्थ" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "बिघडलेली अर्काईव्हज" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "अयोग्य अर्काईव्ह ओळख सही" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "अर्काईव्ह खूप छोटे आहे" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "अर्काईव्ह शीर्षके वाचणे असफल" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "%s -> %s डायव्हर्जन दुप्पट मिळवा" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s फाईल बंद करण्यास असमर्थ" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "मार्ग %s हा खूप लांब आहे" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "मार्ग खूप लांब आहे" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s स्टॅट करण्यास असमर्थ" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "अनपार्सेबल नियंत्रण फाईल" @@ -2321,494 +2323,499 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "%s निवडक भाग सापडत नाही" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "%s संरचना फाईल उघडत आहे" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून समाविष्ट " -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... चूक/त्रुटी!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... झाले" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... झाले" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "आदेश रेखा पर्याय '%c' [पासून %s] हे माहित नाही." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "आदेश रेखा पर्याय %s नीट समजला नाही" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "पर्याय %s साठी ऑर्गुमेंट पाहिजे" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "पर्याय %s: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "'%s' पर्याय खूप लांब आहे" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "%s अवैध क्रिया" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "%s माऊंट पॉईंट स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "फाईल बंद करण्यात अडचण" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "फाईल बंद करण्यात अडचण" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s साठी पाईप उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "संचिकेची syncing समस्या" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "संस्थापन खंडित करत आहे." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "पॅकेज अस्थाई स्मृतिकोष" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "अवलंबित" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "पूर्व अवलंबित" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "सुचवणे" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "शिफारस" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "परस्परविरोध" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "परत त्याठिकाणी आणा" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "अप्रचलित" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "तोडले" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "अत्यावश्यक" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "आवश्यक" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "मानक" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "एच्छिक" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "अधिक" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "अवलंबित रचना बांधणी करत आहे" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "कंॅडिडेट आवृत्त्या" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "अवलंबित/विसंबून असलेले उत्पादन " -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "स्थिती माहिती वाचत आहे" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "%s StateFile उघडणे असफल" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s उघडत आहे" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2819,19 +2826,19 @@ msgstr "" "गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर " "करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2839,218 +2846,213 @@ msgstr "" "दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " "पॅकेजेस असू शकते." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "संचयिका यादीत %s पार्शल हरवले आहे." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. " -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ " -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s स्टॅट करण्यात असमर्थ. " -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "उगमांच्या याद्या वाचता येणार नाहीत." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही " -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "%s पिनचा प्रकार समजलेला नाही" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली " "आहे." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा " "ओलांडली आहे." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "पॅकेज याद्या वाचत आहोत" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "आकार जुळतनाही" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "%s अवैध क्रिया" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3058,12 +3060,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3072,12 +3074,12 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3085,67 +3087,67 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "सिडी-रॉम माउंट होत आहे...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "ओळखत आहे..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "ग्रहण केलेले नामदर्शक: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3154,22 +3156,22 @@ msgstr "" "%zu पॅकेजेसची यादी/सूची, %zu स्त्रोताची यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu " "स्वाक्षऱ्या/सिगनेचर्स सापडल्या\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "'%s' लेबल सापडले\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "ते स्विकारण्याजोगे/वैध नांव नाही, पुन्हा प्रयत्न करा.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3178,34 +3180,34 @@ msgstr "" "ह्या डिस्कला/चकतीला: म्हणतात\n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "नविन स्त्रोत सूची लिहित आहे\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i माहितीसंच लिहिले.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" @@ -3220,88 +3222,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s कार्य सापडू शकले नाही" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3310,167 +3312,167 @@ msgstr "" "काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा " "त्याऐवजी जुन्या वापरल्या गेल्या." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s संस्थापित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s संरचित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s काढून टाकत आहे" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "'%s' संचयिका गहाळ आहे" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s तयार करित आहे" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s सुटे/मोकळे करीत आहे " -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "%s संरचने साठी तयार करत आहे" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s संस्थापित झाले" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/nb.po b/po/nb.po index 6edc93013..118f57dd3 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -22,154 +22,154 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.6.1\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Antall pakkenavn: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Antall pakkestrukturer: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Vanlige pakker: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Rent virtuelle pakker: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakker: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Sammensatte virtuelle pakker: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Mangler: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Antall unike versjoner: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Antall unike beskrivelser: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Antall avhengighetsforhold: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Antall forhold versjon/fil: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Antall forhold beskrivelse/fil: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Antall tilbudte tilknyttinger: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Antall utvidede strenger: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Total plass for avhengighetsforhold/versjoner: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Plass brukt av slark: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Samlet mengde redegjort plass: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ikke oppdatert." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Fant ingen pakker" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Du må oppgi minst ett søkemønster" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke å finne pakken %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Låste pakker:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(ikke funnet)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pakke låst til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompilert på %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -244,28 +244,28 @@ msgstr "" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Sett inn en disk i lagringsenheten og trykk Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikke montere «%s» på «%s»" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett." @@ -301,65 +301,65 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Klarte ikke finne noen pakken med regex «%s»" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Klarte ikke finne noen pakken med regex «%s»" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Klarte ikke finne noen pakken med regex «%s»" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Velger «%s» som kildepakke istedenfor «%s»\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s satt til automatisk installasjon.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemløser ødela noe" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Du må angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" @@ -384,116 +384,116 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken " "%s er for ny" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,37 +502,37 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -621,7 +621,7 @@ msgstr "" "for mer informasjon og flere valg.\n" " Denne APT har kraften til en Superku.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Du må angi minst en pakke du vil ha kildekoden til" @@ -630,7 +630,7 @@ msgstr "Du må angi minst en pakke du vil ha kildekoden til" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -643,53 +643,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "men er ikke installert" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s satt til automatisk installasjon.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s satt til manuell installasjon.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Klarte ikke å åpne %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -716,7 +716,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -766,52 +766,52 @@ msgstr "" msgid "Disk not found." msgstr "Disk ikke funnet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Logger inn" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Klarte ikke å fastslå navnet på motparten" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Klarte ikke å fastslå det lokale navnet" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Tjeneren nektet oss å kople til og sa: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -819,121 +819,123 @@ msgstr "" "En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::" "ftp::ProxyLogin» er tomt." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Tidsavbrudd på forbindelsen" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Lesefeil" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Et svar oversvømte bufferen." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Klarte ikke å opprette en sokkel" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Mislyktes" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Klarte ikke å koble til en passiv sokkel." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Klarte ikke å binde til sokkel" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Klarte ikke å lytte til sokkel" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Klarte ikke å avgjøre sokkelnavnet" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Klarte ikke å sende PORT-kommandoen" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjent adressefamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Tidsavbrudd på tilkoblingen til datasokkelen" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikke å hente fila, tjeneren sa «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Tidsavbrudd på datasokkelen" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Spørring" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Klarte ikke å starte" @@ -969,7 +971,7 @@ msgstr "Klarte ikke å koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" @@ -999,37 +1001,37 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjøring av gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "De følgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1037,95 +1039,95 @@ msgstr "" "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen " "ikke er tilgjengelig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Venter på hoder" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Ødelagt hodelinje" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Intern feil" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges å fjernes, men funksjonen er slått av." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullførte ikke" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Så rart ... Størrelsene stemmer ikke overens, send en e-post til " @@ -1133,53 +1135,53 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må hente %sB/%sB med arkiver.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må hente %sB med arkiver.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ja, gjør som jeg sier!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1190,19 +1192,19 @@ msgstr "" "For å fortsette skriv inn teksten «%s»\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Avbryter." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Vil du fortsette?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Klarte ikke laste ned alle filene" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1210,19 +1212,19 @@ msgstr "" "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " "«--fix-missing»." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nå ikke" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Klarer ikke å rette på manglende pakker." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Avbryter installasjonen." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1236,15 +1238,15 @@ msgstr[1] "" "De følgende pakkene forsvant fra systemet ditt siden\n" "alle filene er overskrevet av andre pakker:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1262,15 +1264,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1281,7 +1283,7 @@ msgstr[0] "" msgstr[1] "" "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1289,18 +1291,18 @@ msgid_plural "" msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n" msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem." msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1308,7 +1310,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1320,145 +1322,145 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Ødelagte pakker" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsadvarsel overstyrt.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Installer disse pakkene uten verifikasjon?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "men er ikke installert" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1466,27 +1468,27 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" @@ -1495,7 +1497,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[J/n]" @@ -1503,91 +1505,91 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Retter på avhengighetsforhold ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " mislyktes." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Klarer ikke å rette på avhengighetsforholdene" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke å minimere oppgraderingsettet" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Utført" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Utført" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1599,43 +1601,43 @@ msgstr "" " Husk også at låsing er deaktivert, så ikke regn med \n" " relevans i forhold til den reelle gjeldende situasjonen." -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Klarte ikke å endre navnet på %s til %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Funnet " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Hent:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Feil " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Hentet %sB på %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Arbeider]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1648,19 +1650,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Klarer ikke å endre %s" @@ -1689,11 +1691,11 @@ msgstr "Ingen speilfil «%s» funnet" msgid "[Mirror: %s]" msgstr "[Speil: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" @@ -1734,7 +1736,7 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen." msgid "Merging available information" msgstr "Fletter tilgjengelig informasjon" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1759,40 +1761,40 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lista over kildeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innholdsfila" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1874,26 +1876,26 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Setter en vilkårlig innstilling" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Ingen utvalg passet" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa «%s»" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsøker å oppgradere %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1901,192 +1903,192 @@ msgstr "" "DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " "fjern og så gjenopprett databasen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikke å åpne Databasefila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikke å få statusen på %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Klarte ikke å finne en peker" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Klarte ikke å lese katalogen %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Klarte ikke å få statusen på %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "F:" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A:" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikke å slå opp %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Klarte ikke å finne fram i treet" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Klarte ikke å åpne %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikke å lese lenken %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikke å oppheve lenken %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikke å lenke %s til %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %s B er nådd.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppføring\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppføring\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binæroverstyringsoppføring heller\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikke å tildele minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Klarte ikke å åpne %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Ugyldig overstyring %s linje %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Klarte ikke å lese overstyringsfila %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Ugyldig overstyring %s linje %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Ugyldig overstyring %s linje %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Ugyldig overstyring %s linje %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjent komprimeringsalgoritme «%s»" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s trenger et komprimeringssett" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Klarte ikke å opprette FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Klarte ikke å forgreine prosess" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Komprimer barneprosess" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikke å opprette %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Klarte ikke å kommunisere med underprosess/fil" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Klarte ikke å lese under utregning av MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2140,157 +2142,157 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Klarte ikke å opprette rør" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Klarte ikke å kjøre gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Feil ved lesing av arkivmedlemshode" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Ugyldig arkivmedlemshode %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshode" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Klarte ikke å lese arkivhodene" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode ble startet på et knutepunkt som ennå er lenket" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Fant ikke nøkkelelementet." -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Klarte ikke å tildele avledning" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern feil i AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbel tillegging av avledning %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Klarte ikke å skrive fila %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Pakker ut %s mer enn en gang" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avledet" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prøver å skrive til avledningsmålet %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Avledningsstien er for lang" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Fant ikke knutepunktet i dens hash-spann" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriver over pakketreff uten versjon for %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikke å få statusen på %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern feil, fant ikke medlemmet %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Kontrollfila kan ikke tolkes" @@ -2351,482 +2353,487 @@ msgstr "" "av brukeren." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lit %lim %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lit %lim %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%lim %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjent typeforkortelse: «%c»" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Åpner oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka starter uten navn." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Feil på taggen" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det øverste nivået" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herfra" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "Syntaksfeil %s:%u: clear-direktivet krever et valgtre som argument" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Skjønner ikke kommandolinjevalget %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjevalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Valget %s krever et argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valget %s må ha et heltallsargument, ikke «%s»" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Valget «%s» er for langt" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Skjønner ikke %s. Prøv «true» eller «false»." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig operasjon %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Klarer ikke å fastsette monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Klarer ikke å få statusen på CD-spilleren" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem ved låsing av gzip-fila %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikke åpne låsefila %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Får ikke låst %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok signalet %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem ved låsing av gzip-fila %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Klarte ikke åpne fila %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Klarte ikke åpne fildeskriptor %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Klarte ikke å opprette underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Klarte ikke å kjøre komprimeringen" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problem ved låsing av fila %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenke til fila %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "klarte ikke å endre navnet, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Ingen nøkkelring installert i %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Pakkens lagerfil er ødelagt" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Pakkens lagerfil er ødelagt" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT støtter ikke versjonssystemet «%s»" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret ble bygd for en annen arkitektur" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Avhenger av" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Forutsetter" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Foreslår" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Anbefaler" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Er i konflikt med" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Nuller" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Ødelegger" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Forbedrer" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "påkrevet" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "vanlig" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "valgfri" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versjons-kandidater" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Leser tilstandsinformasjon" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Klarte ikke å åpne StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Klarte ikke å skrive midlertidig StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke å fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2835,12 +2842,12 @@ msgstr "" "Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf " "under APT::Immediate-Configure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2851,19 +2858,19 @@ msgstr "" "%s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du " "virkelig vil det, så bruk innstillingen APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Oversiktsfil av typen «%s» støttes ikke" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2871,216 +2878,211 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappa %spartial mangler." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Arkivmappa %spartial mangler." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Klarte ikke låse mappa %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Henter fil %li av %li (%s gjenværende)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Henter fil %li av %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Finner ikke metode-driveren %s." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» støttes ikke" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Klarer ikke finne informasjonom %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»." -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Det kan hende du vil kjøre «apt-get update» for å rette på disse problemene" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Forsto ikke spikring av typen %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Lageret har et uoverensstemmende versjonssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Feil oppsto under behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jøss, du har overgått antallet versjoner denne APT klarer." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Leser pakkelister" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "klarte ikke å endre navnet, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hashsummen stemmer ikke" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Feil størrelse" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3090,12 +3092,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3104,78 +3106,78 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Ingen avsnitt i Release-fila %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Ingen sjekksumoppføring i Release-fila %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ugyldig «Date»-oppføring i Release-fila %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Venter på CD-en...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Indentifiserer..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Lagret merkelapp: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Leter gjennom CD for indeksfiler...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3184,7 +3186,7 @@ msgstr "" "Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3192,16 +3194,16 @@ msgstr "" "Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc " "eller du har valgt feil arkitektur?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Fant merkelapp «%s»\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldig navn, prøv igjen.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3210,34 +3212,34 @@ msgstr "" "CD-en er kalt: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" @@ -3252,37 +3254,37 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsummen stemmer ikke for: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Klarte ikke å finne oppgave «%s»" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Klarte ikke finne noen pakken med regex «%s»" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3291,56 +3293,56 @@ msgstr "" "Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den " "har ingen av dem" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er " "installert" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Kjører dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3349,118 +3351,118 @@ msgstr "" "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Setter opp %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Fjerner %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Legger merke til at %s forsvinner" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Kjører etter-installasjonsutløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Mappa «%s» mangler" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder oppsett av %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder å fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive til %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "avhengighetsproblemer - lar den være uoppsatt" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3468,7 +3470,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en " "følgefeil fra en tidligere feil." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3476,7 +3478,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3484,7 +3486,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for " "minne»-feil" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3493,13 +3495,13 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3507,20 +3509,20 @@ msgid "" msgstr "" "Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet," -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Ikke låst" diff --git a/po/ne.po b/po/ne.po index 59da544fa..ac7107726 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -17,157 +17,157 @@ msgstr "" "Plural-Forms: nplurals=2;plural=(n!=1)\n" "X-Generator: KBabel 1.10.2\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "कूल प्याकेज नामहरू :" -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "कूल प्याकेज नामहरू :" -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " सामान्य प्याकेजहरू:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr "शुद्ध अवास्तविक प्याकेजहरू:" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " एकल अवास्तविक प्याकेजहरू:" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " मिश्रित अवास्तविक प्याकेजहरू:" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " हराइरहेको:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "कूल भिन्न संस्करणहरू:" -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "कूल भिन्न संस्करणहरू:" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "कूल निर्भरताहरू:" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "जम्मा ver/file सम्बन्धहरू: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "जम्मा ver/file सम्बन्धहरू: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "कूल उपलब्ध मानचित्रणहरू:" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "कूल शिथिल खाली ठाऊँ:" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "को लागि कूल खाली ठाऊँ लेखांकन:" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "कुनै प्याकेजहरू फेला परेन" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "प्याकेज %s तोक्न असक्षम भयो" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "प्याकेज फाइलहरू:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "क्यास sync भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "पिन गरिएका प्याकेजहरू:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(फेला परेन)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " स्थापना भयो:" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " उमेद्वार:" -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(कुनै पनि होइन)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr "प्याकेज पिन:" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " संस्करण तालिका:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -241,29 +241,29 @@ msgstr "" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन फाइल सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" "धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म्यानुल पृष्टहरू हेर्नुहोस् ।\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "कृपया यो डिस्कको लागि नाम उपलब्ध गराउनुहोस्, जस्तै 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । " @@ -299,65 +299,65 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" @@ -377,114 +377,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -493,37 +493,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -608,7 +608,7 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" @@ -617,7 +617,7 @@ msgstr "को लागि स्रोत तान्न कम्तिम msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -630,53 +630,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "तर यो स्थापना भएन" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "%s खोल्न असफल" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -703,7 +703,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -751,52 +751,52 @@ msgstr "%s मा सिडी रोम अनमाउन्ट गर्न msgid "Disk not found." msgstr "डिस्क फेला परेन ।" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "लगइन भइरहेछ" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "समान नाम निर्धारण गर्न असक्षम भयो" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "पास असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -804,121 +804,123 @@ msgstr "" "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin " "खाली छ ।" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "टाइप असफल भयो: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "जडान समय सकियो" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "एउटा सकेट सिर्जना गर्न सकेन" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "असफल भयो" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "निस्क्रिय सकेट जडान गर्न सकिएन" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "सकेट बाँध्न सकिएन" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "सकेटमा सुन्न सकिएन" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "सकेट नाम निर्धारण गर्न सकिएन" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "पोर्ट आदेश पठाउन असक्षम भयो" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "अज्ञात ठेगाना परिवार %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "डेटा सकेटको जडान समय सकियो" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "डेटा सकेट समय सकियो" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "क्वेरी" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "आह्वान गर्न असक्षम भयो" @@ -954,7 +956,7 @@ msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" @@ -984,182 +986,182 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "हेडरहरुको लागि पर्खिदैछ" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "खराब हेडर लाइन" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "आन्तरिक त्रुटि" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "हो,मैले भने जस्तै गर्नुहोस्!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1170,20 +1172,20 @@ msgstr "" "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "परित्याग गर्नुहोस् ।" -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 #, fuzzy msgid "Do you want to continue?" msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1191,19 +1193,19 @@ msgstr "" "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास " "गर्नुहुन्छ ?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "स्थापना परित्याग गरिदैछ ।" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1213,15 +1215,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1237,16 +1239,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1256,7 +1258,7 @@ msgid_plural "" msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1264,17 +1266,17 @@ msgid_plural "" msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1282,7 +1284,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1295,146 +1297,146 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! " -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 #, fuzzy msgid "Install these packages without verification?" msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? " -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr "वा" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1442,27 +1444,27 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" @@ -1471,7 +1473,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1479,91 +1481,91 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "निर्भरताहरू सुधार गरिदैछ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr "असफल भयो ।" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr "काम भयो" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "काम भयो" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1571,43 +1573,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "हान्नुहोस्" -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "प्राप्त गर्नुहोस्:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s (%sB/s) मा %sB मा तानियो\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [काम गरिरहेको]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1620,19 +1622,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s पढ्न असफल भयो" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "%s मा परिवर्तन गर्न असक्षम" @@ -1661,11 +1663,11 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "जडान असमायिक बन्द भयो" @@ -1707,7 +1709,7 @@ msgstr "" msgid "Merging available information" msgstr "उपलब्ध सूचना गाँभिदैछ" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1731,40 +1733,40 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? " -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "प्याकेज विस्तार सूचि अति लामो छ" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "स्रोत विस्तार सूचि अति लामो छ" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1847,217 +1849,217 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "कुनै चयनहरू मेल खाएन" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB फाइल %s असक्षम भयो: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr " %s स्थिर गर्न असफल" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "कर्सर प्राप्त गर्न असक्षम भयो" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s स्थिर गर्न असक्षम\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s हल गर्न असफल भयो" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "ट्री हिडाईँ असफल भयो" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s खोल्न असफल" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "लिङ्क पढ्न असफल %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "अनलिङ्क गर्न असफल %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s मा %s लिङ्क असफल भयो" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s खोल्न असफल" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "अधिलेखन फाइल पढ्न असफल %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #२" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "FILE* सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "काँटा गर्न असफल" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "सङ्कुचन शाखा" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "MD5 गणना गर्दा पढ्न असफल भयो" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2110,157 +2112,157 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "पाइपहरू सिर्जना गर्न असफल" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "gzip कार्यन्वयन गर्न असफल" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "अवैध संग्रह हस्ताक्षर" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि " -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "अवैध संग्रह सदस्य हेडर" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "अवैध संग्रह सदस्य हेडर" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "संग्रह अति छोटो छ" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "संग्रह हेडरहरू पढ्न असफल" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "ह्यास तत्व तोक्न असफल भयो" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "मोड बाँड्न असफल भयो" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "थपमोडमा आन्तरिक त्रुटि" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "मोडको डबल थप %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s फाइल बन्द गर्न असफल भयो" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "बाटो %s अति लामो छ " -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "डाइरेक्ट्री %s फेरियो " -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "घुम्ती बाटो अति लामो छ" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "बाटो अति लामो छ" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s स्थिर गर्न असक्षम भयो" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल" @@ -2318,495 +2320,500 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "चयन %s फेला पार्न सकिएन" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "कनफिगरेसन फाइल खोलिदैछ %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... त्रुटि!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... गरियो" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... गरियो" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "आदेश लाइन विकल्प %s बुझिएन" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "आदेश लाइन विकल्प %s बूलियन छैन" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "विकल्प %s: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा =<val> हुनुपर्छ ।" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "विकल्प %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "विकल्प '%s' अति लामो छ" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "फाइल बन्द गर्दा समस्या" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "फाइल बन्द गर्दा समस्या" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s को लागि पाइप खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "स्थापना परित्याग गरिदैछ ।" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "खाली प्याकेज क्यास" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "प्याकेज क्यास फाइल दूषित भयो " -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "प्याकेज क्यास फाइल दूषित भयो " -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "आधारित" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "पुन:आधारित" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "सुझाव दिन्छ" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "सिफारिस गर्दछ" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "द्वन्दहरू" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "बदल्छ" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "वेकायमहरू" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "महत्वपूर्ण" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "आवश्यक" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "मानक" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "वैकल्पिक" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "अतिरिक्त" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "निर्भरता ट्री निर्माण गरिदैछ" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "उमेद्वार संस्करणहरू" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "निर्भरता सिर्जना" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "उपलब्ध सूचना गाँभिदैछ" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "%s खोल्न असफल" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2817,18 +2824,18 @@ msgstr "" "हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::" "Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2836,215 +2843,210 @@ msgstr "" "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " "कारणले गर्दा हो ।" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "विधि %s सही रुपले सुरू हुन सकेन" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s स्थिर गर्न असक्षम भयो ।" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "पिन टाइप %s बुझ्न सकिएन " -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "प्याकेज सूचिहरू पढिदैछ" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "साइज मेल खाएन" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3052,12 +3054,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3066,101 +3068,101 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "घुमाउरो फाइलमा अवैध लाइन:%s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "डिस्को लागि पर्खिदै...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "सिडी रोम माउन्ट गरिदै...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "परिचय गराइदैछ..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i हस्ताक्षरहरू फेला परे\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "त्यो वैध नाम होइन, फेरी प्रयास गर्नुहोस् ।\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3169,34 +3171,34 @@ msgstr "" "यो डिस्कको नाम:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i रेकर्डहरू लेखियो ।\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" @@ -3211,88 +3213,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum मेल भएन" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3301,167 +3303,167 @@ msgstr "" "केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " "एउटा प्रयोग गरियो ।" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr " %s कनफिगर गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr " %s हटाइदैछ" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr " %s तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr " %s हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr " %s हट्यो" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %s मा लेख्न असक्षम" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/nl.po b/po/nl.po index c68ada677..613a6ac6c 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -21,153 +21,153 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Totaal aantal pakketnamen: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Totaal aantal pakketstructuren: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normale pakketten: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Zuiver virtuele pakketten: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Losstaande virtuele pakketten: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Gemengde virtuele pakketten: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Ontbrekend: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Totaal aantal verschillende versies: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Totaal aantal verschillende beschrijvingen: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Totaal aantal vereisten: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Totaal aantal versie/bestand-relaties: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Totaal aantal Beschrijving/bestand-relaties: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Totaal aantal 'Voorziet'-toewijzingen " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Totaal aantal geglobde strings: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Totale hoeveelheid vereisten-versieruimte: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Totale onbenutte ruimte: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Totale hoeveelheid verantwoorde ruimte: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Pakketbestand %s is niet meer gesynchroniseerd." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Geen pakketten gevonden" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "U dient precies één zoekpatroon op te geven" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Pakketbestanden:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Vastgepinde pakketten:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(niet gevonden)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Geïnstalleerd: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidaat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(geen)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pakketpin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -241,30 +241,30 @@ msgstr "" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp.\n" "Zie de man-pagina's van apt-cache(8) en apt.conf(5) voor meer informatie.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Gelieve een naam voor deze schijf op te geven, bijvoorbeeld 'Debian 5.0.3 " "Schijf 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Aankoppelen van '%s' op '%s' is mislukt" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set." @@ -301,67 +301,67 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Kon geen enkel pakket vinden bij regex '%s'" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Kon geen enkel pakket vinden bij regex '%s'" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Kon geen enkel pakket vinden bij regex '%s'" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s is ingesteld op automatische geïnstalleerd.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" @@ -388,97 +388,97 @@ msgstr "" "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " "te halen.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +487,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -633,7 +633,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koe kracht.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -644,7 +644,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -657,53 +657,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "maar het is niet geïnstalleerd" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s is ingesteld op automatische geïnstalleerd.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Openen van %s is mislukt" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -730,7 +730,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -779,52 +779,52 @@ msgstr "" msgid "Disk not found." msgstr "Schijf niet gevonden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Bezig met aanmelden" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Kan de 'peer'-naam niet bepalen" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Kan de lokale naam niet bepalen" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Onze verbinding is door de server geweigerd met bericht: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislukt; bericht van server: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislukt; bericht van server: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -832,121 +832,123 @@ msgstr "" "Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::" "ProxyLogin is leeg." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislukt; bericht van server: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Verbinding is verlopen" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Leesfout" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Een reactie deed de buffer overlopen" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Schrijffout" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Kon geen socket aanmaken" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Kon de datasocket niet verbinden, de verbinding verliep" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Mislukt" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Kon de passieve socket niet verbinden." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kon geen luistersocket verkrijgen" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Kon geen socket binden" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Kon niet op de socket niet luisteren" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Kon de socketnaam niet bepalen" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Kan PORT-commando niet verzenden" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Onbekende adresfamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT is mislukt; bericht van server: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Datasocket verbinding is verlopen" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kan bestand niet ophalen; bericht van server: %s" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Datasocket verliep" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Data transfer is mislukt, server zei: %s" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Zoekopdracht" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Aanroepen mislukt van " @@ -982,7 +984,7 @@ msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" @@ -1012,40 +1014,40 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kan geen verbinding maken met %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1053,98 +1055,98 @@ msgstr "" "De volgende ondertekeningen konden niet geverifieerd worden omdat de " "publieke sleutel niet beschikbaar is:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Interne fout" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian." @@ -1152,52 +1154,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1208,19 +1210,19 @@ msgstr "" "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Afbreken." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Wilt u doorgaan?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1228,19 +1230,19 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1254,15 +1256,15 @@ msgstr[1] "" "De volgende pakketten zijn van uw systeem verdwenen omdat\n" "alle bestanden zijn overschreven door andere pakketten:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1280,15 +1282,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1300,7 +1302,7 @@ msgstr[1] "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1309,20 +1311,20 @@ msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n" msgstr[1] "" "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "U kunt deze verwijderen via 'apt-get autoremove'." msgstr[1] "U kunt deze verwijderen via 'apt-get autoremove'." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1330,7 +1332,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1341,146 +1343,146 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Authentificatiewaarschuwing is genegeerd.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthentificeerd worden" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Wilt u deze pakketten installeren zonder verificatie?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " of" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1488,27 +1490,27 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" @@ -1517,7 +1519,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[J/n]" @@ -1525,91 +1527,91 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Vereisten worden gecorrigeerd..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " mislukt." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet corrigeren" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Klaar" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "De opdracht 'update' aanvaard geen argumenten" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Klaar" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1621,43 +1623,43 @@ msgstr "" " Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n" " vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Hernoemen van %s naar %s is mislukt" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Geraakt " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Ophalen:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Genegeerd " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Fout " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%sB opgehaald in %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Bezig]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1670,19 +1672,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Kan %s niet veranderen" @@ -1711,11 +1713,11 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" @@ -1760,7 +1762,7 @@ msgstr "" msgid "Merging available information" msgstr "De beschikbare informatie wordt samengevoegd" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1785,40 +1787,40 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Pakket-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Fout bij het verwerken van map %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Bron-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1902,26 +1904,26 @@ msgstr "" " -c=? Lees dit configuratiebestand in\n" " -o=? Stel een willekeurige configuratie optie in" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Geen van de selecties kwam overeen" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB is beschadigd, bestand hernoemd naar %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1929,192 +1931,192 @@ msgstr "" "DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van " "apt, dient u de database te verwijderen en opnieuw aan te maken." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kan het DB-bestand %s niet openen: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "stat op %s is mislukt" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kon map %s niet lezen\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kon de status van %s niet opvragen\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "F: Er zijn fouten van toepassing op het bestand " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Oplossen van %s is mislukt" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Doorlopen boomstructuur is mislukt" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Openen van %s is mislukt" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " OntlLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "readlink op %s is mislukt" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Ontlinken van %s is mislukt" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linken van %s aan %s is mislukt" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB bereikt.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Geheugentoewijzing is mislukt" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kan %s niet openen" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Misvormde voorrangsingang %s op regel %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Lezen van het voorrangsbestand %s is mislukt" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Misvormde voorrangsingang %s op regel %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Misvormde voorrangsingang %s op regel %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Misvormde voorrangsingang %s op regel %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Onbekend compressie-algoritme '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Gecomprimeerde uitvoer %s vereist een compressieset" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Aanmaken van FILE* is mislukt" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Vorken van proces is mislukt" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Comprimeer kind" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Interne fout, aanmaken van %s is mislukt" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "IO naar subproces/bestand is mislukt" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2168,157 +2170,157 @@ msgstr "" " -c=? Lees dit configuratiebestand\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Aanmaken pijp is mislukt" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Uitvoeren van gzip is mislukt " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Beschadigd archief" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Ongeldige archiefondertekening" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Ongeldige koptekst voor archiefonderdeel: %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Ongeldige koptekst in archiefonderdeel" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Archief is te kort" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Lezen van de archiefkopteksten is mislukt" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode werd aangeroepen op een nog gelinkte knoop" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Lokaliseren van het hash-element is mislukt!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Toewijzen van de omleiding is mislukt" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Interne fout in AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Er wordt gepoogd om de omleiding %s->%s en %s/%s te overschrijven" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dubbele toevoeging van de omleiding %s->%s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Het pad %s is te lang" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s wordt meer dan eens uitgepakt" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "De map %s is al omgeleid" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Het omleidingspad is te lang" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "De map %s wordt vervangen door een niet-map" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Vinden van de knoop in de hash-emmer is mislukt" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Het pad is te lang" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Kan de status van %s niet opvragen" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Interne fout, kon onderdeel %s niet vinden" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Niet-ontleedbaar 'control'-bestand" @@ -2379,491 +2381,496 @@ msgstr "" "door de gebruiker is uitgeschakeld." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %liu %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%liu %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Onbekende type-afkorting '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Configuratiebestand %s wordt geopend" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfout %s:%u: Blok start zonder naam." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfout %s:%u: Extra rommel na waarde" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven " "worden" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Syntaxfout %s:%u: De richtlijn 'clear' vereist een optieboom als argument" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fout!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Klaar" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Klaar" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Commandoregel-optie '%c' [van %s] is onbekend." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Commandoregel-optie %s wordt niet begrepen" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Commandoregel-optie %s is niet booleaans" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Optie %s vereist een argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Optie %s: De specificatie van het configuratie-item dient een =<waarde> te " "bevatten." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Optie %s vereist een integer getal als argument, niet '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Optie '%s' is te lang" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Ongeldige operatie %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "stat op de CD-ROM is mislukt" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Probleem bij het afsluiten van het gzip-bestand %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Subproces %s ontving signaal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Probleem bij het afsluiten van het gzip-bestand %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Kon de bestandsindicator %d niet openen" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Aanmaken subproces-IPC is mislukt" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Uitvoeren van de compressor is mislukt " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "herbenoeming is mislukt, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Geen sleutelring geïnstalleerd in %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Lege pakketcache" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Het pakketcachebestand is beschadigd" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Het pakketcachebestand heeft een niet-compatibele versie" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Het pakketcachebestand is beschadigd" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "De pakketcache was aangemaakt voor een andere architectuur" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Vereisten" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Voor-Vereisten" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Suggesties" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Aanbevelingen" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Conflicteert met" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Vervangt" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Verouderd" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Breekt" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Vult aan" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "belangrijk" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "noodzakelijk" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standaard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "optioneel" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Kandidaat-versies" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Generatie vereisten" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "De status informatie wordt gelezen" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Openen van StateFile %s is mislukt" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2872,12 +2879,12 @@ msgstr "" "Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie " "'man 5 apt.conf', onder APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2889,12 +2896,12 @@ msgstr "" "vaak slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie " "te activeren." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexbestand van type '%s' wordt niet ondersteund" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2902,7 +2909,7 @@ msgstr "" "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2910,226 +2917,221 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Archiefmap %spartial is afwezig." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Kan de map %s niet vergrendelen" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Bestand %li van %li wordt opgehaald" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Het methodestuurprogramma %s kon niet gevonden worden." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op " "'enter' te drukken." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Kan de status van %s niet opvragen." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te " "bevatten" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "De pakketlijsten of het statusbestand konden of niet ontleed, of niet " "geopend worden." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Cache heeft een niet-compatibel versienummeringssysteem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fout tijdens verwerken van %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wauw, u heeft meer pakketten dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wauw, u heeft meer versies dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aan kan " "overschreden." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "herbenoeming is mislukt, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Grootte komt niet overeen" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Ongeldige operatie %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3140,12 +3142,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3154,12 +3156,12 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3167,67 +3169,67 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Geen secties in Release-bestand %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Geen Hash-vermelding in Release-bestand %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Geen 'Date'-vermelding in Release-bestand %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Verkopersblok %s bevat geen vingerafdruk" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "CD wordt afgekoppeld...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificatie..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Opgeslagen label: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "CD wordt afgekoppeld...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Er wordt gescand voor indexbestanden...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3236,7 +3238,7 @@ msgstr "" "Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu " "handtekeningen gevonden\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3244,16 +3246,16 @@ msgstr "" "Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de " "verkeerde architectuur?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Label '%s' gevonden\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3262,34 +3264,34 @@ msgstr "" "De schijf heet:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3306,38 +3308,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Kon taak '%s' niet vinden" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kon geen enkel pakket vinden bij regex '%s'" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3346,57 +3348,57 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze " "niet geïnstalleerd is" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "dpkg wordt uitgevoerd" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3405,120 +3407,120 @@ msgstr "" "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s wordt geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s wordt volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "De verdwijning van %s wordt opgemerkt" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Post-installatie-trigger %s wordt uitgevoerd" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Map '%s' ontbreekt" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s is geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan niet naar %s schrijven" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen " "(MaxReports) al is bereikt" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problemen met vereisten - wordt niet geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3526,7 +3528,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een " "eerdere mislukking." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3534,7 +3536,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3542,7 +3544,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over onvoldoende-geheugen." -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3551,14 +3553,14 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout over " "dpkg-I/O is." -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3567,21 +3569,21 @@ msgstr "" "Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander " "proces?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" "dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Niet vergrendeld" diff --git a/po/nn.po b/po/nn.po index 6409df3fc..d66a4e1a2 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,157 +19,157 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Tal p pakkenamn: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Tal p pakkenamn: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Vanlege pakkar: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Reine virtuelle pakkar: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakkar: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Samansette virtuelle pakkar: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Manglar: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Tal p einskildversjonar: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "Tal p einskildversjonar: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Tal p krav: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Tal p ver./fil-forhold: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "Tal p ver./fil-forhold: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Tal p tilbyr-forhold: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Tal p strengar med jokerteikn: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Storleik p kravs- og versjonsrom: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Slingringsmon: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Brukt plass i alt: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ute av takt." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Fann ingen pakkar" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "Du m oppgi nyaktig eitt mnster" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Spikra pakkar:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(ikkje funne)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pakke spikra til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -242,19 +242,11 @@ msgstr "" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" "Du finn meir informasjon p manualsidene apt-cache(8) og apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -262,12 +254,20 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikkje endra namnet p %s til %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -303,66 +303,66 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" @@ -382,115 +382,115 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -499,37 +499,37 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -615,7 +615,7 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" @@ -624,7 +624,7 @@ msgstr "Du m msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -637,53 +637,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "men er ikkje installert" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "men %s skal installerast" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Klarte ikkje opna %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -710,7 +710,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -760,52 +760,52 @@ msgstr "" msgid "Disk not found." msgstr "Fann ikkje fila" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Loggar inn" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Klarte ikkje avgjera namnet p motparten" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Klarte ikkje avgjera det lokale namnet" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Tenaren nekta oss kopla til, og sa: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislukkast, tenaren sa: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislukkast, tenaren sa: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -813,121 +813,123 @@ msgstr "" "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet " "Acquire::ftp::ProxyLogin er tomt." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandoen %s i innlogginsskriptet mislukkast, tenaren sa: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislukkast, tenaren sa: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Tidsavbrot p samband" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Lesefeil" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Eit svar flaumde over bufferen." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Klarte ikkje oppretta sokkel" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Mislukkast" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Klarte ikkje kopla til passiv sokkel." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Klarte ikkje binda til sokkel" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Klarte ikkje lytta til sokkel" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Klarte ikkje avgjera sokkelnamnet" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Klarte ikkje senda PORT-kommandoen" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjend adressefamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislukkast, tenaren sa: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Tidsavbrot p tilkopling til datasokkel" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikkje henta fila, tenaren sa %s" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Tidsavbrot p datasokkelen" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverfringa mislukkast, tenaren sa %s" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Sprjing" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Klarte ikkje starta " @@ -963,7 +965,7 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" @@ -993,184 +995,184 @@ msgstr "Det hende noko dumt ved oppslag av msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Ventar p hovud" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "ydelagd hovudlinje" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Intern feil" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M henta %sB/%sB med arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M henta %sB med arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1181,19 +1183,19 @@ msgstr "" "For halda fram, m du skriva nyaktig %s.\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Avbryt." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Vil du halda fram?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1201,19 +1203,19 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller " "--fix-missing." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og byte av medium er ikkje sttta for tida" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Avbryt installasjon." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1223,15 +1225,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1247,16 +1249,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1266,7 +1268,7 @@ msgid_plural "" msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:" msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1274,18 +1276,18 @@ msgid_plural "" msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:" msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1293,7 +1295,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1305,145 +1307,145 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "ydelagde pakkar" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "TVARING: Klarer ikkje autentisere desse pakkane." -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Installer desse pakkane utan verifikasjon?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "men er ikkje installert" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1452,27 +1454,27 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" @@ -1481,7 +1483,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[J/n]" @@ -1489,92 +1491,92 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Rettar p krav ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " mislukkast." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta p krav" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Ferdig" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prv med -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Ferdig" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1582,43 +1584,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Klarte ikkje endra namnet p %s til %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Treff " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Hent:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Feil " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Henta %sB p %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Arbeider]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1631,19 +1633,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Klarte ikkje byta til %s" @@ -1672,11 +1674,11 @@ msgstr "Klarte ikkje opna fila %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" @@ -1716,7 +1718,7 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p msgid "Merging available information" msgstr "Flettar informasjon om tilgjengelege pakkar" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1740,40 +1742,40 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lista over kjeldeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innhaldsfila" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -1853,217 +1855,217 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling." -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Ingen utval passa" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er for gammal, forskjer oppgradere %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikkje opna DB-fila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikkje f status til %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Klarte ikkje f peikar" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr ": Klarte ikkje lesa katalogen %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr ": Klarte ikkje f status til %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr ": " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikkje sl opp %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Treklatring mislukkast" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikkje lesa lenkja %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikkje oppheva lenkja %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikkje lenkja %s til %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikkje tildela minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Klarte ikkje opna %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Misforma overstyring %s linje %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Klarte ikkje lesa overstyringsfila %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Misforma overstyring %s linje %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Misforma overstyring %s linje %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Misforma overstyring %s linje %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjend komprimeringsalgoritme %s" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s treng eit komprimeringssett" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Klarte ikkje oppretta FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Klarte ikkje gafla" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikkje oppretta %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Klarte ikkje lesa under utrekning av MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2116,157 +2118,157 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Klarte ikkje oppretta ryr" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Klarte ikkje kyra gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "ydelagt arkiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjend TAR-hovud type %u, medlem %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Feil ved lesing av arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Ugyldig arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Klarte ikkje lesa arkivhovuda" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode vart kalla p ein node som framleis er lenkja" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Fann ikkje nkkelelementet." -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Klarte ikkje tildela avleiing" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern feil i AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Prver skriva over ei avleiing, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbel tilleggjing av avleiing %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Stigen %s er for lang" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkar ut %s meir enn in gong" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avleidd" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prver skriva til avleiingsmlet %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Avleiingsstigen er for lang" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Fann ikkje noden i nkkelbtta" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Stigen er for lang" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriv over pakketreff utan versjon for %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikkje f status til %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern feil, fann ikkje medlemmen %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Kontrollfila kan ikkje tolkast" @@ -2324,495 +2326,500 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjend typeforkorting: %c" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka startar utan namn." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Misforma tagg" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nsta inkluderte filer" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herifr" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kjenner ikkje kommandolinjevalet %c (fr %s)." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Skjnar ikkje kommandolinjevalet %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjevalet %s er ikkje boolsk" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Valet %s krev eit argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Val %s: Spesifikasjonen av oppsettselementet m ha ein =<verdi>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valet %s m ha eit heiltalsargument, ikkje %s" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Valet %s er for langt" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Skjnar ikkje %s. Prv true eller false." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig operasjon %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje f status til monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem ved lsing av fila" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem ved lsing av fila" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Klarte ikkje opna ryr for %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Klarte ikkje oppretta underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Klarte ikkje kyra komprimeringa " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "endring av namn mislukkast, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Avbryt installasjon." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Pakkelagerfila er ydelagd" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Versjonen til pakkelagerfila er ikkje kompatibel" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Pakkelagerfila er ydelagd" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT stttar ikkje versjonssystemet %s" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret er bygd for ein annan arkitektur" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Krav" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Forkrav" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Forslag" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Tilrdingar" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Konflikt" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Byter ut" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Foreldar" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "pkravd" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "vanleg" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Byggjer kravtre" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Kandidatversjonar" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Genererer kravforhold" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "Flettar informasjon om tilgjengelege pakkar" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Klarte ikkje opna %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2824,18 +2831,18 @@ msgstr "" "om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiltypen %s er ikkje sttta" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2843,54 +2850,54 @@ msgstr "" "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Arkivkatalogen %spartial manglar." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Klarte ikkje lsa listekatalogen" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Les filliste" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Finn ikkje metodedrivaren %s." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, c-format msgid "Is the package %s installed?" msgstr "" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2898,165 +2905,160 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s er ikkje sttta" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Klarte ikkje f status p %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list." -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Du vil kanskje prva retta p desse problema ved kyra apt-get update." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Skjnar ikkje spikringstypen %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Feil ved behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jss, du har overgtt talet p krav som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Les pakkelister" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "endring av namn mislukkast, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Feil storleik" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3064,12 +3066,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3078,101 +3080,101 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Merk, vel %s i staden for %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Ugyldig linje i avleiingsfila: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Ventar p disk ...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identifiserer ... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Leitar etter indeksfiler p disken ...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Det er ikkje eit gyldig namn, prv igjen.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3181,34 +3183,34 @@ msgstr "" "Disken vert kalla: \n" "%s\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skreiv %i postar med %i manglande filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skreiv %i postar med %i filer som ikkje passa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" @@ -3223,88 +3225,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Feil MD5-sum" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3313,167 +3315,167 @@ msgstr "" "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrdingar" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Klarte ikkje skriva til %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Klarte ikkje lsa listekatalogen" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/pl.po b/po/pl.po index 71d03395e..b9c22bad7 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -23,155 +23,155 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakiet %s w wersji %s ma niespełnione zależności:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Liczba nazw pakietów: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Liczba wszystkich typów pakietów: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Zwykłych pakietów: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Czysto wirtualnych pakietów: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pojedynczych pakietów wirtualnych: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Mieszanych pakietów wirtualnych: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Brakujących: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "W sumie różnych wersji: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "W sumie różnych opisów: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "W sumie zależności: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "W sumie zależności wersja/plik: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "W sumie zależności opis/plik: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "W sumie mapowań zapewnień: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "W sumie dopasowanych napisów: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Sumaryczny rozmiar obszaru zależności od wersji: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Całkowity rozmiar: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Plik pakietu %s jest przestarzały." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Nie znaleziono żadnych pakietów" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Należy podać przynajmniej jeden wzorzec" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Plików pakietów:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Magazyn podręczny jest przestarzały, nie można odwołać się (x-ref) do pliku " "pakietu." #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Przypięte pakiety:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nie znaleziono)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Zainstalowana: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandydująca: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(brak)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Sposób przypięcia: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -242,28 +242,28 @@ msgstr "" "Więcej informacji można znaleźć na stronach podręcznika apt-cache(8)\n" "oraz apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\"" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Proszę włożyć dysk do napędu i nacisnąć enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nie udało się zamontować \"%s\" w \"%s\"" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Należy powtórzyć ten proces dla reszty płyt." @@ -299,50 +299,50 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "" "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "" "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "" "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\"" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s zaznaczony jako zainstalowany automatycznie.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -350,21 +350,21 @@ msgstr "" "To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-" "mark manual\"." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" @@ -391,80 +391,80 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -473,17 +473,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -492,7 +492,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " "w pakietach \"%s\"" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -501,14 +501,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -517,7 +517,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " "pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -526,30 +526,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -637,7 +637,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -648,7 +648,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -661,55 +661,55 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s nie może zostać oznaczony, ponieważ nie jest zainstalowany.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s został już ustawiony jako zainstalowany ręcznie.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s został już ustawiony jako zainstalowany automatycznie.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s został już zatrzymany.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s został już odznaczony jako zatrzymany.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s został zatrzymany.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Odznaczono zatrzymanie %s\n" # Musi pasować do su i sudo. -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" "Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -758,7 +758,7 @@ msgstr "" "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n" "i apt.conf(5), aby uzyskać więcej informacji." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -806,52 +806,52 @@ msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używ msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Logowanie się" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Nie można określić nazwy zdalnego systemu" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Nie udało się określić nazwy lokalnego systemu" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -859,123 +859,125 @@ msgstr "" "Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, " "Acquire::ftp::ProxyLogin jest puste." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: " "%s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Przekroczenie czasu połączenia" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Błąd odczytu" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Odpowiedź przepełniła bufor." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Błąd zapisu" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Nie udało się utworzyć gniazda" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Nie udało się" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Nie udało się połączyć pasywnego gniazda." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Nie udało się przyłączyć gniazda" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Nie udało się nasłuchiwać na gnieździe" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Nie udało się określić nazwy gniazda" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Nie można wysłać polecenia PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Nieznana rodzina adresów %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Przekroczony czas połączenia gniazda danych" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nie można pobrać pliku, odpowiedź serwera: %s" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Przekroczony czas oczekiwania na dane" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Info" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Nie można wywołać " @@ -1011,7 +1013,7 @@ msgstr "Nie udało się połączyć z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Łączenie z %s" @@ -1041,39 +1043,39 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1081,95 +1083,95 @@ msgstr "" "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza " "publicznego:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogą być prawidłowymi archiwami" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Oczekiwanie na nagłówki" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Nieprawidłowa linia nagłówka" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Połączenie nie powiodło się" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Błąd wewnętrzny" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Błąd wewnętrzny, sortowanie niezakończone" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod " @@ -1177,53 +1179,53 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiwów.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Wystąpiły problemy, a użyto -y bez --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy." # Bezpieczniej jest nie używać tu polskich znaków. #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Tak, jestem pewien!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1234,19 +1236,19 @@ msgstr "" "Aby kontynuować proszę napisać zdanie \"%s\"\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Przerwane." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Kontynuować?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Nie udało się pobrać niektórych plików" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1254,19 +1256,19 @@ msgstr "" "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " "update lub użyć opcji --fix-missing." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Nie udało się poprawić brakujących pakietów." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1283,15 +1285,15 @@ msgstr[2] "" "Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " "zostały nadpisane przez inne pakiety:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Uwaga: dpkg wykonał to automatycznie i celowo." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1309,15 +1311,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Błąd wewnętrzny spowodowany przez AutoRemover" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1333,7 +1335,7 @@ msgstr[2] "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1348,19 +1350,19 @@ msgstr[2] "" "%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej " "wymagane.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"." msgstr[1] "Aby je usunąć należy użyć \"apt-get autoremove\"." msgstr[2] "Aby je usunąć należy użyć \"apt-get autoremove\"." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1368,7 +1370,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1380,145 +1382,145 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Zainstalować te pakiety bez weryfikacji?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " lub" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1526,27 +1528,27 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" @@ -1555,7 +1557,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[T/n]" @@ -1563,92 +1565,92 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Naprawianie zależności..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " nie udało się." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Nie udało się naprawić zależności" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Nie udało się zminimalizować zbioru aktualizacji" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Gotowe" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Niespełnione zależności. Proszę spróbować użyć -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Gotowe" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1660,46 +1662,46 @@ msgstr "" " Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n" " na związku z rzeczywistą sytuacją!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Nie udało się zmienić nazwy %s na %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" # Ujednolicono z aptitude -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Stary " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Pobieranie:" # Wyrównane do Hit i Err. -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign. " # Wyrównane do Hit i Ign. -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Błąd " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Pobrano %sB w %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Pracuje]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1712,19 +1714,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Nie można czytać %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nie udało się przejść do %s" @@ -1753,11 +1755,11 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Połączenie zostało przedwcześnie zamknięte" @@ -1800,7 +1802,7 @@ msgstr "" msgid "Merging available information" msgstr "Łączenie informacji o dostępnych pakietach" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1824,40 +1826,40 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Lista rozszerzeń pakietów jest zbyt długa" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Błąd przetwarzania katalogu %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lista rozszerzeń źródeł jest zbyt długa" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Błąd podczas przetwarzania zawartości %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1940,26 +1942,26 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny\n" " -o=? Ustawia dowolną opcję konfiguracji" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nie dopasowano żadnej nazwy" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarzała, próbuję zaktualizować %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1967,192 +1969,192 @@ msgstr "" "Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę " "usunąć i utworzyć ponownie bazę danych." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nie udało się otworzyć pliku bazy %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Nie udało się wykonać operacji stat na %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu kontrolnego" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Nie udało się pobrać kursora" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nie udało się odczytać katalogu %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nie można wykonać operacji stat na %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Błędy odnoszą się do pliku " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Nie udało się przetłumaczyć nazwy %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Przejście po drzewie nie powiodło się" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Nie udało się otworzyć %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Odłączenie %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Nie udało się odczytać dowiązania %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Nie udało się usunąć %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nie udało się dowiązać %s do %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Osiągnięto ograniczenie odłączania %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Archiwum nie posiadało pola pakietu" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nie posiada również wpisu w pliku override binariów\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nie udało się zaalokować pamięci" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nie można otworzyć %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Nieprawidłowa linia %llu #1 pliku override %s" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nie udało się czytać pliku override %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Nieprawidłowa linia %llu #1 pliku override %s" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Nieprawidłowa linia %llu #2 pliku override %s" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Nieprawidłowa linia %llu #3 pliku override %s" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Nieznany algorytm kompresji \"%s\"" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Nie udało się utworzyć obiektu FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Nie udało się utworzyć procesu potomnego" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Potomny proces kompresujący" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Zawiodła operacja IO na pliku/podprocesie" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Nie udało się zmienić nazwy %s na %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2205,157 +2207,157 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Nie udało się utworzyć potoków" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Nie udało się uruchomić programu gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Uszkodzone archiwum" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nieznany typ nagłówka TAR %u, składnik %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Nieprawidłowy podpis archiwum" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Błąd przy czytaniu nagłówka składnika archiwum" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Nieprawidłowy nagłówek składnika archiwum: %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Nieprawidłowy nagłówek składnika archiwum" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Archiwum jest za krótkie" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Nie udało się odczytać nagłówków archiwum" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode wywołane na wciąż podłączonym węźle" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Nie udało się odnaleźć elementu tablicy haszującej!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nie udało się utworzyć ominięcia" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Błąd wewnętrzny w AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Podwójne dodanie ominięcia %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Nie udało się zapisać pliku %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Nie udało się zamknąć pliku %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Ścieżka %s jest zbyt długa" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Wypakowanie %s więcej niż raz" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Ominięcie katalogu %s" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Zbyt długa ścieżka ominięcia" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Ścieżka jest zbyt długa" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Nadpisujący pakiet nie pasuje z wersją %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Nie można wykonać operacji stat na %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\"" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany" @@ -2416,210 +2418,205 @@ msgstr "" "zostało wyłączone przez użytkownika." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lidni %lig %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lig %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nierozpoznany skrót typu: \"%c\"" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Błąd składniowy %s:%u: Błędny znacznik" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Błąd składniowy %s:%u: Zbyt wiele zagnieżdżonych operacji include" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Błąd składniowy %s:%u: Włączony tutaj" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\"" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Błąd składniowy %s:%u: Śmieci na końcu pliku" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Błąd!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Gotowe" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Gotowe" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Niezrozumiała opcja linii poleceń %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Opcja linii poleceń %s nie jest typu logicznego" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Opcja %s wymaga argumentu." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\"" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opcja \"%s\" jest zbyt długa" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Nie udało się wykonać operacji stat na CDROM-ie" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem przy zamykaniu pliku gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia " "pliku" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2627,279 +2624,289 @@ msgstr "" "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe " "rozszerzenie pliku" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodował naruszenie ochrony pamięci." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s otrzymał sygnał %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem przy zamykaniu pliku gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Nie udało się otworzyć deskryptora pliku %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Nie udało się utworzyć IPC z podprocesem" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Nie udało się uruchomić kompresora " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Brak zainstalowanej bazy kluczy w %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Pusty magazyn podręczny pakietów" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Magazyn podręczny pakietów jest uszkodzony" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Magazyn podręczny pakietów jest uszkodzony - jest zbyt mały" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\"" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Wymaga" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Wymaga wstępnie" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Sugeruje" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Poleca" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "W konflikcie z" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Zastępuje" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Dezaktualizuje" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Narusza zależności" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Rozszerza" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "ważny" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "wymagany" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standardowy" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcjonalny" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "dodatkowy" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Budowanie drzewa zależności" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Kandydujące wersje" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Generowanie zależności" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Odczyt informacji o stanie" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Nie udało się otworzyć pliku stanu %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Nie udało się zapisać tymczasowego pliku stanu %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nie udało się zanalizować pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2909,12 +2916,12 @@ msgstr "" "5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " "się więcej. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Nie udało się skonfigurować \"%s\". " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2926,12 +2933,12 @@ msgstr "" "rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję " "APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2939,7 +2946,7 @@ msgstr "" "Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " "archiwum." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2947,88 +2954,88 @@ msgstr "" "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " "zatrzymanymi pakietami." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Brakuje katalogu archiwów %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Nie udało się zablokować katalogu %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Pobieranie pliku %li z %li (pozostało %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Pobieranie pliku %li z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomiła się poprawnie" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietów \"%s\" nie jest obsługiwany" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Nie udało się określić odpowiedniego typu systemu pakietów" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Nie udało się wykonać operacji stat na pliku %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Należy uruchomić apt-get update aby naprawić te problemy." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Nie udało się odczytać list źródeł." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3037,98 +3044,93 @@ msgstr "" "Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie " "wydanie nie jest dostępne w źródłach" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypięcia" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Magazyn podręczny ma niezgodny system wersji" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Czytanie list pakietów" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Błędny rozmiar" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3137,16 +3139,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3155,12 +3157,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3170,12 +3172,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3184,79 +3186,79 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Nie udało się przeanalizować pliku Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Brak sekcji w pliku Release %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Brak wpisu Hash w pliku Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Nieprawidłowy wpis Date w pliku Release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Blok producenta %s nie zawiera odcisku" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Użycie %s jako punktu montowania CD-ROM-u\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Odmontowanie CD-ROM-u...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Oczekiwanie na płytę...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROM-u...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identyfikacja... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Etykieta: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Odmontowanie CD-ROM-u...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Skanowanie płyty w poszukiwaniu plików indeksu...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3265,7 +3267,7 @@ msgstr "" "Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów " "tłumaczeń i %zu podpisów\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3273,16 +3275,16 @@ msgstr "" "Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk " "Debiana lub jest to inna architektura?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Znaleziono etykietę \"%s\"\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "To nie jest prawidłowa nazwa, proszę spróbować ponownie.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3291,34 +3293,34 @@ msgstr "" "Płyta nosi nazwę: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopiowanie list pakietów..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy źródeł\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordów.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" @@ -3333,41 +3335,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Nie udało się odnaleźć zadania \"%s\"" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3376,59 +3378,59 @@ msgstr "" "Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", " "ponieważ nie ma żadnej z nich" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest " "zainstalowany" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Przygotowywanie na otrzymanie rozwiązania" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" "Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania " "prawidłowego komunikatu o błędzie" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Uruchamianie dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3436,118 +3438,118 @@ msgstr "" "Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub " "użyto ich starszej wersji." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Instalowanie %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Całkowite usuwanie %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Proszę odnotować zniknięcie %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Uruchamianie wyzwalacza post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Brakuje katalogu \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Nie udało się otworzyć pliku \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Przygotowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowywanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Pakiet %s został zainstalowany" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowywanie do usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Pakiet %s został usunięty" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowywanie do całkowitego usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Pakiet %s został całkowicie usunięty" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nie udało się pisać do %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Operacja została przerwana, zanim mogła zostać zakończona" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3555,7 +3557,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " "przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3563,7 +3565,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3571,7 +3573,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " "braku wolnej pamięci" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3580,14 +3582,14 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " "wejścia/wyjścia dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3597,7 +3599,7 @@ msgstr "" "używa?" # Musi pasować do su i sudo. -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3606,14 +3608,14 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" "dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem." -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Niezablokowany" diff --git a/po/pt.po b/po/pt.po index c30934820..2771d44ea 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -18,156 +18,156 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.0\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Total de nomes de pacotes: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Total de estruturas de pacotes: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Pacotes normais: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Pacotes virtuais puros: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pacotes virtuais únicos: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Pacotes virtuais misturados: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Faltam: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Total de versões distintas: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Total de descrições distintas: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Total de dependências: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Total de relações ver/ficheiro: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Total de relações Desc/Ficheiro: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Total de Mapeamentos 'Provides': " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Total de strings globbed: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Espaço total de dependência de versão: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Espaço total desperdiçado: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Espaço total contabilizado: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro do pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Tem de fornecer pelo menos um padrão de busca" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark " "showauto'." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Não foi possível encontrar o pacote %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Ficheiros de Pacotes :" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pacotes Marcados:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(não encontrado)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(nenhum)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Marcação do Pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -238,29 +238,29 @@ msgstr "" "tmp\n" "Para mais informações veja as páginas do manual apt-cache(8) e apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Por favor indique um nome para este Disco, tal como 'Debian 5.0.3 Disco 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor insira um Disco no leitor e pressione enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falhou ao montar '%s' para '%s'" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este processo para o resto dos CDs no seu conjunto." @@ -297,47 +297,47 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está definido para ser instalado automaticamente.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -345,19 +345,19 @@ msgstr "" "Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' " "e 'apt-mark manual'." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" @@ -383,81 +383,81 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,18 +466,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +486,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido " "em pacotes '%s'" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +495,14 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +511,7 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque a versão " "candidata do pacote %s não pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não " "tem versão candidata" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -633,7 +633,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" @@ -642,7 +642,7 @@ msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -655,53 +655,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s não pode ser marcado pois não está instalado.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s já estava definido para ser instalado manualmente.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s já estava definido para ser instalado automaticamente.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s já estava marcado para manter.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s já estava para não manter.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s marcado para manter.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Cancelou manter em %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Falhou executar dpkg. É root?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -749,7 +749,7 @@ msgstr "" "tmp\n" "Para mais informações veja as páginas apt-mark(8) e apt.conf(5) do manual." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -797,52 +797,52 @@ msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Ficheiro não encontrado" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, URIs locais não devem começar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "A identificar-se no sistema" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Não foi possível determinar o nome do posto" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Não foi possível determinar o nome local" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor recusou a ligação e respondeu: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER falhou, o servidor respondeu: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS falhou, o servidor respondeu: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -850,121 +850,123 @@ msgstr "" "Foi especificado um servidor de proxy mas não um script de login, Acquire::" "ftp::ProxyLogin está vazio." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, o servidor respondeu: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Foi atingido o tempo limite de ligação" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Erro de leitura" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Uma resposta sobrecarregou o buffer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Erro de escrita" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Não foi possível criar um socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível ligar socket de dados, a ligação expirou" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Falhou" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Não foi possível ligar socket passivo." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo não foi capaz de obter um socket de escuta" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Não foi possível fazer o bind a um socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Não foi possível executar listen no socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Não foi possível determinar o nome do socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Não foi possível enviar o comando PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Família de endereços %u desconhecida (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falhou, o servidor respondeu: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Ligação de socket de dados expirou" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Expirou o tempo do socket de dados" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "A transferência de dados falhou, o servidor respondeu '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Não foi possível invocar " @@ -1000,7 +1002,7 @@ msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "A ligar a %s" @@ -1030,40 +1032,40 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está " "instalado?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1071,116 +1073,116 @@ msgstr "" "As seguintes assinaturas não puderam ser verificadas porque a chave pública " "não está disponível:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios não podem ser arquivos válidos" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "A aguardar por cabeçalhos" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP possui suporte de range errado" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Erro interno" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Estranho... Os tamanhos não coincidiram, escreva para apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário obter %sB/%sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário obter %sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1188,31 +1190,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e foi utilizado -y sem --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas isto não é uma operação trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1223,19 +1225,19 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Abortado." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Deseja continuar?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1243,19 +1245,19 @@ msgstr "" "Não foi possível obter alguns arquivos, tente talvez correr apt-get update " "ou tente com --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Não foi possível corrigir os pacotes em falta." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "A abortar a instalação." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1269,15 +1271,15 @@ msgstr[1] "" "Os seguintes pacotes desapareceram do seu sistema pois\n" "todos os ficheiros foram por outros pacotes:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1295,15 +1297,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover estragou coisas" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1315,7 +1317,7 @@ msgstr[1] "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1324,17 +1326,17 @@ msgstr[0] "O pacote %lu foi instalado automaticamente e já não é necessário. msgstr[1] "" "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Utilize 'apt-get autoremove' para o remover." msgstr[1] "Utilize 'apt-get autoremove' para os remover." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1342,7 +1344,7 @@ msgstr "" "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1354,145 +1356,145 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Pacotes estragados" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação ultrapassado.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Instalar estes pacotes sem verificação?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1500,27 +1502,27 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1529,7 +1531,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[S/n]" @@ -1537,91 +1539,91 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "N" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "A corrigir dependências..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " falhou." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Não foi possível corrigir dependências" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Não foi possível minimizar o conjunto de actualizações" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Feito" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Pronto" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1633,43 +1635,43 @@ msgstr "" "\tTenha em mente que o acesso exclusivo está desabilitado,\n" "\tpor isso não confie na relevância da real situação actual!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Falha ao baixar %s %s\n" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Hit " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Obter:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Obtidos %sB em %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [A trabalhar]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1682,19 +1684,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Não foi possível ler %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@ -1723,11 +1725,11 @@ msgstr "Não pode ler ficheiro de mirror '%s'" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Ligação encerrada prematuramente" @@ -1771,7 +1773,7 @@ msgstr "" msgid "Merging available information" msgstr "A juntar a informação disponível" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1796,40 +1798,40 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Não conseguiu escrever para %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não pode obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "A lista de extensão de pacotes é demasiado longa" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Erro ao processar o directório %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lista de extensão de códigos-fonte é demasiado longa" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Erro ao processar o conteúdo %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1910,26 +1912,26 @@ msgstr "" " -c=? Ler este ficheiro de configuração\n" " -o=? Definir uma opção de configuração arbitrária" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nenhuma selecção coincidiu" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A base de dados é antiga, a tentar actualizar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1937,192 +1939,192 @@ msgstr "" "O formato da BD é inválido. Se actualizou a partir de uma versão antiga do " "apt, por favor remova-a e crie novamente a base de dados." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Falha stat %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "O arquivo não tem registo de controlo" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Não foi possível ler o directório %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Não foi possível fazer stat %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Os erros aplicam-se ao ficheiro " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Falhou resolver %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Falhou ao percorrer a árvore" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Falhou abrir %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Falhou o readlink %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Falhou o unlink %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falhou ligar %s a %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arquivo não possuía campo package" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " o maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada binária de 'override'\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Falhou alocar memória" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Não foi possível abrir %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Override %s malformado linha %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Falhou ler o ficheiro override %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Override %s malformado linha %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Override %s malformado linha %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Override %s malformado linha %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compressão desconhecido '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compressão" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Falhou criar FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Falhou o fork" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Compactar filho" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro Interno, falhou criar %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Falhou o IO para subprocesso/arquivo" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Falhou ler durante o cálculo de MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou renomear %s para %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2175,157 +2177,157 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Falhou a criação de pipes" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Falhou executar gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "A soma de controlo do tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Assinatura de arquivo inválida" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Erro na leitura de cabeçalho membro de arquivo" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Cabeçalho membro de arquivo inválido %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arquivo é demasiado pequeno" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Falha ao ler os cabeçalhos do arquivo" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode chamado em nó ainda linkado" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Falha ao localizar o elemento de hash!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Falha ao alocar desvio (diversion)" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erro Interno em AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adição dupla de desvio %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falhou escrever o ficheiro %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falhou fechar o ficheiro %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "O caminho %s é demasiado longo" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "A descompactar %s mais de uma vez" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "O directório %s é desviado" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O directório %s está a ser substituído por um não-directório" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Falhou localizar o nó no seu hash bucket" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "O caminho é demasiado longo" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Substituir o pacote correspondente sem versão para %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "O ficheiro %s/%s substitui o que está no pacote %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Não foi possível fazer stat %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este não é um arquivo DEB válido, falta o membro '%s'" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erro Interno, não foi possível localizar o membro %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Ficheiro de controle não interpretável" @@ -2386,214 +2388,209 @@ msgstr "" "está desabilitado pelo utilizador." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "A selecção %s não foi encontrada" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuração %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções " "como argumento" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro !" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opção '%c' da linha de comandos [de %s] é desconhecida." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Opção %s de linha de comandos não é compreendida" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Opção %s da linha de comandos não é booleana" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "A opção %s necessita de um argumento." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opção %s: Especificação de item de configuração tem de ter um =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opção %s necessita de um número inteiro como argumento, não '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opção '%s' é demasiado longa" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operação %s inválida" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problema ao fechar o ficheiro gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " "nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Lista de ficheiros que não podem ser criados porque '%s' não é um directório" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome " "do ficheiro" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2601,280 +2598,290 @@ msgstr "" "A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão " "inválida no nome do ficheiro" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "O sub-processo %s recebeu o sinal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problema ao fechar o ficheiro gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Não foi possível abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Falhou criar subprocesso IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Falhou executar compactador " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "falhou renomear, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Nenhum keyring instalado em %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Cache de pacotes vazia" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "O ficheiro de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de cache de pacotes é de uma versão incompatível" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "O ficheiro de cache de pacotes está corrompido, é demasiado pequeno" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "A cache de pacotes foi gerada para uma arquitectura diferente" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Em Conflito" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Estraga" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Aumenta" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "necessário" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "A construir árvore de dependências" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versões candidatas" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Geração de dependências" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "A ler a informação de estado" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Falhou abrir o StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Falha escrever ficheiro temporário StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2883,12 +2890,12 @@ msgstr "" "Não foi possível proceder à configuração imediata em '%s'. Para detalhes, " "por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Não pode configurar '%s'. " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2900,12 +2907,12 @@ msgstr "" "normalmente é mau, mas se você quer realmente fazer isso, active a opção " "APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo do ficheiro de índice '%s' não é suportado" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2913,7 +2920,7 @@ msgstr "" "O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2921,94 +2928,94 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Falta directório de listas %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Falta o directório de arquivos %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Impossível criar acesso exclusivo ao directório %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "A obter o ficheiro %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "A obter o ficheiro %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou correctamente" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento adequado" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Não foi possível fazer stat %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar alguns URIs 'source' no seu sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " "aberto." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3017,103 +3024,98 @@ msgstr "" "O valor '%s' é inválido para APT::Default-Release porque tal lançamento não " "está disponível nas fontes" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de marca (pin) %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "A cache possui um sistema de versões incompatível" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Ocorreu um erro ao processar %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Uau, você excedeu o número de descrições que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "A ler as listas de pacotes" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "A obter File Provides" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "falhou renomear, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Código de verificação hash não coincide" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Tamanho incorrecto" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3122,18 +3124,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3142,12 +3144,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3158,12 +3160,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3173,12 +3175,12 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3186,67 +3188,67 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Não foi possível fazer parse ao ficheiro Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Nenhuma secção, no ficheiro Release %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Nenhuma entrada hash no ficheiro Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Entrada, 'Date', inválida no ficheiro Release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "O bloco de fabricante %s não contém a impressão digital" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A utilizar o ponto de montagem do CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "A desmontar o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "A identificar... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Label Guardada: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "A desmontar o CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "A pesquisar os ficheiros de índice do disco...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3255,7 +3257,7 @@ msgstr "" "Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu " "índices de tradução e %zu assinaturas\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3263,16 +3265,16 @@ msgstr "" "Não foi possível localizar quaisquer ficheiros de pacote, talvez este não " "seja um disco Debian ou seja a arquitectura errada?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Encontrada a etiqueta '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Isso não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3281,34 +3283,34 @@ msgstr "" "Este disco tem o nome: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escreveu %i registos com %i ficheiros em falta.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3325,38 +3327,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Não foi encontrado o Release '%s' para '%s'" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, 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:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Não foi possível encontrar a tarefa '%s'" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3365,57 +3367,57 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Não é possível seleccionar a versão instalada do pacote %s pois não está " "instalado" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Enviar cenário a resolver" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Enviar pedido para resolvedor" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Preparar para receber solução" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Executar resolvedor externo" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "A correr o dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3423,118 +3425,118 @@ msgstr "" "Falhou o download de alguns ficheiros de índice. Foram ignorados ou os " "antigos foram usados em seu lugar." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "A instalar %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "A remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "A notar o desaparecimento de %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "A correr o 'trigger' de pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directório '%s'" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir ficheiro o '%s'" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Não conseguiu escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "A operação foi interrompida antes de poder terminar" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependências - deixando por configurar" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3542,7 +3544,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro " "de seguimento de um erro anterior." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3550,7 +3552,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3558,7 +3560,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " "memória esgotada" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3567,14 +3569,14 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/" "O do dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3583,7 +3585,7 @@ msgstr "" "Não foi possível obter acesso exclusivo ao directório de administração (%s), " "outro processo está a utilizá-lo?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3592,7 +3594,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3600,7 +3602,7 @@ msgstr "" "O dpkg foi interrompido, para corrigir o problema tem de correr manualmente " "'%s'" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Sem acesso exclusivo" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5aab79c68..a16be868a 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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." @@ -17,157 +17,157 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Total de Nomes de Pacotes: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Total de Nomes de Pacotes: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Pacotes normais: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Pacotes puramente virtuais: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pacotes virtuais únicos: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Pacotes virtuais misturados: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Faltando: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Total de versões distintas: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Total de descrições distintas: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Total de dependências: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Total de relações ver/arquivo: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Total de relações Desc/Arquivo: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Total de mapeamentos \"Provides\": " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Total de strings \"globbed\": " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Total de espaço de dependência de versão: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Total de espaço frouxo: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Total de espaço contabilizado para: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "O arquivo de pacote %s está fora de sincronia." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Nenhum pacote encontrado" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "Você deve passar exatamente um padrão" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Arquivos de pacote:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "O cache está fora de sincronia, não foi possível fazer a referência cruzada " "de um arquivo de pacote" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pacotes alfinetados (\"pinned\"):" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(não encontrado)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(nenhum)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pacote alfinetado (\"pin\"): " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabela de versão:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -242,30 +242,30 @@ msgstr "" "tmp\n" "Veja as páginas de manual apt-cache(8) e apt.conf(5) para mais informações.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Por favor, forneça um nome para este Disco, algo como 'Debian 2.1r1 Disco 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor, insira um Disco na unidade e pressione enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falhou ao renomear %s para %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este processo para o restante dos CDs em seu conjunto." @@ -303,65 +303,65 @@ msgstr "" " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Impossível criar trava no diretório de download" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" @@ -381,97 +381,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -480,7 +480,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -489,14 +489,14 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -505,7 +505,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -514,30 +514,30 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando em %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -625,7 +625,7 @@ msgstr "" "para mais informações e opções.\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" @@ -634,7 +634,7 @@ msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -647,53 +647,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "mas não está instalado" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s já é a versão mais nova.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s já é a versão mais nova.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Falhou ao abrir %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -720,7 +720,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -768,52 +768,52 @@ msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválida, URIs locais não devem iniciar com //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Efetuando login" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Impossível determinar o nome do ponto" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Impossível determinar o nome local" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor recusou a conexão e disse: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER falhou, servidor disse: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS falhou, servidor disse: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -821,121 +821,123 @@ msgstr "" "Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::" "ProxyLogin está vazio." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Comando de script de login '%s' falhou, servidor disse: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, servidor disse: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Conexão expirou" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Erro de leitura" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Uma resposta sobrecarregou o buffer" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Erro de escrita" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Não foi possível criar um socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível conectar um socket de dados, conexão expirou" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Falhou" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Não foi possível conectar um socket passivo." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo não foi capaz de obter um socket de escuta" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Não foi possível fazer \"bind\" de um socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Não foi possível ouvir no socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Não foi possível determinar o nome do socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Impossível enviar o comando PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Família de endereços %u desconhecida (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falhou, servidor disse: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Conexão do socket de dados expirou" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problema criando o hash do arquivo" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossível obter arquivo, servidor disse '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Socket de dados expirou" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Transferência de dados falhou, servidor disse '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Impossível invocar " @@ -971,7 +973,7 @@ msgstr "Não foi possível conectar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1001,18 +1003,18 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Impossível conectar em %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura boa, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" @@ -1020,22 +1022,22 @@ msgstr "" "instalado?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1043,95 +1045,95 @@ msgstr "" "As assinaturas a seguir não puderam ser verificadas devido à chave pública " "não estar disponível:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Linha de cabeçalho ruim" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Erro interno" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que estranho... Os tamanhos não batem, mande e-mail para apt@packages.debian." @@ -1139,21 +1141,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É preciso baixar %sB/%sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É preciso baixar %sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1161,31 +1163,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Sim, faça o que eu digo!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1196,19 +1198,19 @@ msgstr "" "Para continuar digite a frase '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Abortar." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Você quer continuar?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1216,19 +1218,19 @@ msgstr "" "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar " "com --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados atualmente" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Impossível corrigir pacotes faltantes." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Abortando instalação." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1238,15 +1240,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1264,15 +1266,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover quebrou coisas" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1286,7 +1288,7 @@ msgstr[1] "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1298,18 +1300,18 @@ msgstr[1] "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Use 'apt-get autoremove' para removê-los." msgstr[1] "Use 'apt-get autoremove' para removê-los." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1317,7 +1319,7 @@ msgstr "" "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1329,145 +1331,145 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram retirados da \"Incoming\"." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Pacotes quebrados" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação sobreposto.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Instalar estes pacotes sem verificação?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "mas não será instalado" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1476,27 +1478,27 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1505,7 +1507,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[S/n]" @@ -1513,91 +1515,91 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " falhou." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de atualizações" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Pronto" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dependências desencontradas. Tente usar -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou coisas" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Pronto" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1605,43 +1607,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Falha ao baixar %s %s\n" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Atingido " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Obter:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Baixados %sB em %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Trabalhando]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1654,19 +1656,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@ -1695,11 +1697,11 @@ msgstr "Não foi possível abrir arquivo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Falhou ao criar pipe IPC para sub-processo" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" @@ -1745,7 +1747,7 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente" msgid "Merging available information" msgstr "Mesclando informação disponível" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1770,40 +1772,40 @@ msgstr "" " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Lista de extensão de pacotes é muito extensa" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Erro processando o diretório %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lista de extensão de fontes é muito extensa" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Erro processando conteúdo %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1885,26 +1887,26 @@ msgstr "" " -c=? Lê o arquivo de configuração especificado.\n" " -o=? Define uma opção de configuração arbitrária" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nenhuma seleção combinou" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD estava corrompido, arquivo renomeado para %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "BD é antigo, tentando atualizar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1913,192 +1915,192 @@ msgstr "" "Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " "apt, por favor, remova e recrie o banco de dados." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossível abrir o arquivo BD %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Falhou ao executar \"stat\" %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Repositório não possui registro de controle" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossível ler o diretório %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossível executar \"stat\" em %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Erros que se aplicam ao arquivo " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Falhou ao resolver %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Falhou ao percorrer a árvore" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Falhou ao abrir %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Falhou ao executar \"readlink\" %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Falhou ao executar \"unlink\" %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falhou ao ligar %s a %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui entrada override fonte\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada override binária\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Falha ao alocar memória" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossível abrir %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Override malformado %s linha %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Falha ao ler o arquivo override %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Override malformado %s linha %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Override malformado %s linha %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Override malformado %s linha %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compactação desconhecido '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compactação" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Falhou ao criar FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Falhou ao executar \"fork\"" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Compactar filho" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro interno, falhou ao criar %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "E/S para sub-processo/arquivo falhou" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Falhou ao ler durante o cálculo MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problema removendo %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou ao renomear %s para %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2153,157 +2155,157 @@ msgstr "" " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Falhou ao criar \"pipes\"" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Falhou ao executar gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Assinatura de arquivo inválida" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Erro na leitura de cabeçalho membro de arquivo" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arquivo é muito pequeno" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Falhou ao ler os cabeçalhos do arquivo" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Falhou ao localizar o elemento hash!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Falhou ao alocar desvio (\"diversion\")" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erro interno em \"AddDiversion\"" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adição dupla de desvio %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falhou ao escrever arquivo %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falhou ao fechar arquivo %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "O caminho %s é muito longo" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Desempacotando %s mais de uma vez" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "O diretório %s é desviado (\"diverted\")" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O pacote está tentando escrever no alvo do desvio %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O diretório %s está sendo substituído por um não-diretório" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Falha ao localizar nó em seu \"hash bucket\"" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "O caminho é muito longo" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Impossível executar \"stat\" em %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erro interno, não foi possível localizar membro %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Arquivo de controle não interpretável" @@ -2360,502 +2362,507 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Seleção %s não encontrada" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviação de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo arquivo de configuração %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opção de linha de comando '%c' [de %s] é desconhecida." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Opção de linha de comando %s não é compreendida" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Opção de linha de comando %s não é booleana" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Opção %s requer um argumento." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Opção %s: Especificação de item de configuração deve possuir um =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opção %s requer um argumento inteiro, não '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opção '%s' é muito longa" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operação %s inválida" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossível executar \"stat\" no ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Impossível executar \"stat\" no cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problema fechando o arquivo" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não usando travamento para arquivo de trava somente leitura %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando travamento para arquivo de trava montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problema fechando o arquivo" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Não foi possível abrir \"pipe\" para %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Falhou ao criar sub-processo IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Falhou ao executar compactador " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "renomeação falhou, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Abortando instalação." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Cache de pacotes vazio" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "O arquivo de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "O arquivo de cache de pacotes é uma versão incompatível" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "O arquivo de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "O cache de pacotes foi gerado para uma arquitetura diferente" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Conflita" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Quebra" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "requerido" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Construindo árvore de dependências" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versões candidatas" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Geração de dependência" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Lendo informação de estado" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2867,12 +2874,12 @@ msgstr "" "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo de arquivo de índice '%s' não é suportado" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2880,7 +2887,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "arquivo para o mesmo." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2888,222 +2895,217 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Diretório de listas %spartial está faltando." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Diretório de arquivos %spartial está faltando." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Impossível criar trava no diretório de listas" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Obtendo o arquivo %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Obtendo arquivo %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável." -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Impossível executar \"stat\" %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar algumas URIs 'source' em seu sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "As listas de pacotes ou os arquivos de estado não puderam ser analisados ou " "abertos." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "A lista de fontes não pode ser lida." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de \"pin\" %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\"" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "O cache possui um sistema de versões incompatível" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Um erro ocorreu processando %s (EncontrarPacote)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Uau, você excedeu o número de descrições que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Lendo listas de pacotes" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Coletando Arquivo \"Provides\"" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar cache fonte" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "renomeação falhou, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hash Sum incorreto" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Tamanho incorreto" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3111,12 +3113,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3126,12 +3128,12 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3139,67 +3141,67 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" "\" para o pacote %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Nota, selecionando %s ao invés de %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Linha inválida no arquivo de desvios: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Aguardando por disco...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montando CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificando... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Rótulo armazenado: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Procurando por arquivos de índice no disco...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3208,22 +3210,22 @@ msgstr "" "Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu " "índice(s) de traduções e %zu assinatura(s)\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Rótulo encontrado: '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3232,34 +3234,34 @@ msgstr "" "Esse disco é chamado: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Gravados %i registros.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Gravados %i registros com %i arquivos faltando.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Gravados %i registros com %i arquivos que não combinam\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3276,88 +3278,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum incorreto" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Impossível achar tarefa %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Impossível achar pacote %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Impossível achar pacote %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3366,167 +3368,167 @@ msgstr "" "Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " "antigos foram usados no lugar." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Removendo %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Executando gatilho pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Diretório '%s' está faltando" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossível escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Impossível criar trava no diretório de listas" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/ro.po b/po/ro.po index d10785e00..1504ec4a3 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,156 +19,156 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pachetul %s versiunea %s are o dependență neîndeplinită:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Total nume pachete : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Total nume pachete : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Pachete normale: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Pachete virtuale pure: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Pachete virtuale singulare: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Pachete virtuale mixte: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Lipsă: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Total versiuni distincte: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Numărul total de descrieri distincte: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Total dependențe: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Total relații versiune/fișier: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Total relații desc/fișier: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Total cartări Furnizează: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Total șiruri înglobate: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Total spațiu versiuni ale dependențelor: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Total spațiu intern: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Total spațiu contorizat pentru: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Fișierul pachetului %s este desincronizat." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Nu s-au găsit pachete" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "Trebuie să dați exact un șablon" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Nu s-a putut localiza pachetul %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Fișiere pachet: " -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pachete alese special:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(negăsit)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Instalat: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Candidează: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(niciunul)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pachet ales special: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s compilat la %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -241,29 +241,29 @@ msgstr "" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" "Vedeți manualele apt-cache(8) și apt.conf(5) pentru mai multe informații.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1”" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Introduceți un disc în unitate și apăsați Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Eșec la redenumirea lui %s în %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetați această procedură pentru restul CD-urilor din set." @@ -300,66 +300,66 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nu pot determina starea listei surse de pachete %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" @@ -379,97 +379,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele " "înglobate" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +478,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +487,14 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +503,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,30 +512,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -624,7 +624,7 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" @@ -633,7 +633,7 @@ msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -646,53 +646,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "dar nu este instalat" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Eșec la „open” pentru %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -719,7 +719,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -767,52 +767,52 @@ msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat." msgid "Disk not found." msgstr "Disc negăsit." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Fișier negăsit" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Se autentifică" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Nu se poate detecta numele perechii" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Nu s-a putut detecta numele local" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serverul a refuzat conexiunea și a spus: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "„USER” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "„PASS” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -820,123 +820,125 @@ msgstr "" "Un server proxy a fost precizat, dar nu există nici un script de conectare, " "Acquire::ftp::ProxyLogin este gol." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "„TYPE” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Timpul de conectare a expirat" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Eroare de citire" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Un răspuns a depășit zona de tampon." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Eroare de scriere" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Nu s-a putut crea un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a " "expirat" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Eșec" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Nu s-a putut realiza conectarea la un socket pasiv" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Nu s-a putut realiza asocierea la un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Nu s-a putut asculta pe socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Nu s-a putut detecta numele socket-ului" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Nu s-a putut trimite comanda PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familie de adrese necunoscută %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "„EPRT” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Timpul de conectare la socket-ul de date expirat" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Timp expirat pentru socket-ul de date" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Transferul de date a eșuat, serverul a spus: '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Interogare" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Nu s-a putut invoca" @@ -973,7 +975,7 @@ msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" @@ -1003,40 +1005,40 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" msgid "Unable to connect to %s:%s:" msgstr "Nu s-a putut realiza conexiunea cu %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina " "amprenta digitale a cheii?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1044,149 +1046,149 @@ msgstr "" "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu " "este disponibilă:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "În așteptarea antetelor" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Acest server HTTP are un suport defect de intervale" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Eroare internă" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ce ciudat... Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Este nevoie să descărcați %sB de arhive.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "După această operație vor fi folosiți din disc încă %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveți suficient spațiu în %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Da, fă cum îți spun!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1197,19 +1199,19 @@ msgstr "" "Pentru a continua tastați fraza '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Renunțare." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Vreți să continuați?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Descărcarea unor fișiere a eșuat" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1217,19 +1219,19 @@ msgstr "" "Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get " "update' sau încercați cu --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Abandonez instalarea." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1240,16 +1242,16 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" # XXX: orice sugestie este bine-venită -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1268,15 +1270,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1290,7 +1292,7 @@ msgstr[1] "" msgstr[2] "" "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1302,7 +1304,7 @@ msgstr[1] "" msgstr[2] "" "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." @@ -1310,11 +1312,11 @@ msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge." msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge." msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1322,7 +1324,7 @@ msgstr "" "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet " "(sau oferiți o altă soluție)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1335,145 +1337,145 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Pachete deteriorate" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Avertisment de autentificare înlocuit.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Instalați aceste pachete fără verificare?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Instalat]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalat]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Instalat]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "dar nu este instalat" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " sau" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1481,27 +1483,27 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" @@ -1510,7 +1512,7 @@ msgstr "%lu instalate sau șterse incomplet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1518,92 +1520,92 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Corectez dependențele..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " eșec." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Nu s-au putut corecta dependențele" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Terminat" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dependențe neîndeplinite. Încercați să folosiți -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Terminat" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1611,43 +1613,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Eșec la redenumirea lui %s în %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Atins " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Luat:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ignorat " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Eroare" -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Aduși: %sB în %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [În lucru]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1660,19 +1662,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Nu s-a putut citi %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nu pot schimba la %s" @@ -1701,11 +1703,11 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" @@ -1748,7 +1750,7 @@ msgstr "" msgid "Merging available information" msgstr "Se combină informațiile disponibile" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1772,40 +1774,40 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Nu s-a putut scrie în %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Lista de extensii pentru pachet este prea lungă" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Eroare la prelucrarea directorului %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Lista de extensii pentru sursă este prea lungă" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Eroare la scrierea antetului în fișierul index" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Eroare la prelucrarea conținutului %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1893,26 +1895,26 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nu s-a potrivit nici o selecție" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB a fost corupt, fișierul a fost redenumit %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB este vechi, se încearcă înnoirea %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1921,192 +1923,192 @@ msgstr "" "Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai " "veche, ștergeți și recreați baza de date." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nu s-a putut deschide fișierul DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Eșec la „stat” pentru %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arhiva nu are înregistrare de control" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Nu s-a putut obține un cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Nu s-a putut citi directorul %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Nu s-a putut efectua „stat” pentru %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Erori la fișierul " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Eșec la „resolve” pentru %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Parcurgerea arborelui a eșuat" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Eșec la „open” pentru %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Dezlegare %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Eșec la „readlink” pentru %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Eșec la „unlink” pentru %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Eșec la „link” între %s și %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Eșec la alocarea memoriei" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nu s-a putut deschide %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Înlocuire greșită %s linia %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Înlocuire greșită %s linia %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Înlocuire greșită %s linia %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Înlocuire greșită %s linia %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritm de compresie necunoscut '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Eșec la crearea FIȘIERULUI*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Eșec la „fork”" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Comprimare copil" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Eroare internă, eșec la crearea lui %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "IE către subproces/fișier eșuat" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Eșec la citire în timpul calculului sumei MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Eșec la redenumirea lui %s în %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2160,160 +2162,160 @@ msgstr "" " -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Eșec la crearea conexiunilor" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Eșec la executarea lui gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "" "Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tip antet TAR %u necunoscut, membrul %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Semnătură de arhivă necorespunzătoare" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Eroare la citirea antetului membrului arhivei" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Antet de membru de arhivă necorespunzător" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Antet de membru de arhivă necorespunzător" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arhiva este prea scurtă" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Eșec la citirea antetelor arhivei" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "S-a chemat DropNode pe un nod încă „legat”" # XXX: nu-mi place, fie e hash, fie „element de dispersie” -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Eșec la localizarea elementului de dispersie!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Eșec la alocarea redirectării" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Eroare internă în „AddDiversion”" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adăugare dublă de redirectare %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fișier „conf” duplicat %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Eșec la scrierea fișierului %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Eșec la închiderea fișierului %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Calea %s este prea lungă" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Se despachetează %s de mai multe ori" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Directorul %s este redirectat" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Calea de redirectare este prea lungă" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Directorul %s este înlocuit de un non-director" # XXX: nu-mi place, hash bucket ar trebui tradus mai elegant -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Calea este prea lungă" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pachet suprascris fără nici o versiune pentru %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Nu se poate executa „stat” pe %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Eroare internă, nu pot localiza membrul %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Fișier de control neanalizabil" @@ -2370,497 +2372,502 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Selecția %s nu a fost găsită" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviere de tip nerecunoscut: „%c”" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Se deschide fișierul de configurare %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Eroare de sintaxă %s:%u: etichetă greșită" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Eroare de sintaxă %s:%u: incluse de aici" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârșitul fișierului" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Eroare!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Terminat" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Terminat" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Opțiunea linie de comandă %s nu este înțeleasă" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Opțiunea linie de comandă %s nu este booleană" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Opțiunea %s necesită un argument" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Opțiunea %s: Specificația configurării articolului trebuie să aibă o =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opțiunea %s necesită un argument integru, nu '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opțiunea '%s' este prea lungă" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sensul %s nu este înțeles, încercați adevărat (true) sau fals (false)." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Operațiune invalidă %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Eșec la „stat” pentru CD" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problemă la închiderea fișierului" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problemă la închiderea fișierului" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nu s-a putut deschide conexiunea pentru %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Eșec la crearea IPC-ului pentru subproces" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Eșec la executarea compresorului" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "redenumire eșuată, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Abandonez instalarea." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Cache gol de pachet" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Cache-ul fișierului pachet este deteriorat" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Fișierul cache al pachetului este o versiune incompatibilă" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Cache-ul fișierului pachet este deteriorat" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Acest APT nu suportă versioning system '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Depinde" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Pre-depinde" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Sugerează" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Recomandă" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Este în conflict" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Înlocuiește" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Învechit" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Corupe" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "cerut" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opțional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Se construiește arborele de dependență" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Versiuni candidat" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Generare dependențe" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Se citesc informațiile de stare" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Eșec la deschiderea fișierului de stare %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Eșec la scrierea fișierului temporar de stare %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2872,19 +2879,19 @@ msgstr "" "nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::" "Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipul de fișier index '%s' nu este suportat" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2892,225 +2899,220 @@ msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete ținute." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Directorul de liste %spartial lipsește." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Directorul de arhive %spartial lipsește." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Nu pot încuia directorul cu lista" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Se descarcă fișierul %li din %li (%s rămas)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Se descarcă fișierul %li din %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Nu pot determina starea %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Trebuie să puneți niște 'surse' de URI în sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Listele de pachete sau fișierul de stare n-au putut fi analizate sau " "deschise." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Nu s-a înțeles tipul de pin %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Cache are un versioning system incompatibil" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Eroare apărută în timpul procesării %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Mamăăă, ați depășit numărul de nume de pachete de care este capabil acest " "APT." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Citire liste de pachete" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Colectare furnizori fișier" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "redenumire eșuată, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Operațiune invalidă %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3118,12 +3120,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3132,12 +3134,12 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3145,68 +3147,68 @@ msgstr "" "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Notă, se selectează %s în locul lui %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Linie necorespunzătoare în fișierul-redirectare: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Blocul vânzător %s nu conține amprentă" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilizare punct de montare CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Se demontează CD-ul...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Aștept discul...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Montez CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificare... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Etichetă memorată: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Se demontează CD-ul...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Scanez discul de fișierele index...\n" # DEVELOPERS: please consider using somehow plural forms -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3215,22 +3217,22 @@ msgstr "" "Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri " "de traduceri și %zu semnături\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "A fost găsită eticheta „%s”\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Acesta nu este un nume valid, mai încercați.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3239,34 +3241,34 @@ msgstr "" "Acest disc este numit: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3282,88 +3284,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nu s-a putut găsi sarcina %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nu pot găsi pachetul %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Nu pot găsi pachetul %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3372,167 +3374,167 @@ msgstr "" "Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au " "fost folosite în loc unele vechi." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Se instalează %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Se șterge %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Șters complet %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Se rulează declanșatorul post-instalare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Directorul „%s” lipsește." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Se pregătește %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Se pregătește configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregătește ștergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Șters %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregătește ștergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Șters complet %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nu s-a putut scrie în %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Nu pot încuia directorul cu lista" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/ru.po b/po/ru.po index d087cd2b1..930eb03fe 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -26,153 +26,153 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Всего имён пакетов: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Всего структур пакетов: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Обычных пакетов: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Полностью виртуальных пакетов: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Одиночных виртуальных пакетов: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Смешанных виртуальных пакетов: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Отсутствует: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Всего уникальных версий: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Всего уникальных описаний: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Всего зависимостей: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Всего отношений Версия/Файл: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Всего отношений Описание/Файл: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Всего отношений Provides: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Всего развёрнутых строк: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Всего информации о зависимостях: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Пустого места в кэше: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Полное учтённое пространство: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Список пакетов %s рассинхронизирован." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Не найдено ни одного пакета" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Вы должны задать не менее одно шаблона поиска" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Списки пакетов:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Зафиксированные пакеты:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(не найдено)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Установлен: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(отсутствует)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Фиксатор пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -242,28 +242,28 @@ msgstr "" " -o=? Задать значение произвольной настройки, например, -o dir::cache=/tmp\n" "Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Задайте имя для этого диска, например «Debian 5.0.3 Disk 1»" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Вставьте диск в устройство и нажмите ввод" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не удалось примонтировать «%s» к «%s»" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторите этот процесс для всех имеющихся CD." @@ -300,47 +300,47 @@ msgstr "" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Игнорируется недоступная версия «%s» пакета «%s»" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s выбран для автоматической установки.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -348,20 +348,20 @@ msgstr "" "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark " "manual»." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" @@ -386,80 +386,80 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -468,17 +468,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +487,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -636,7 +636,7 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -646,7 +646,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -659,54 +659,54 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s не может быть помечен, так он не установлен.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s уже помечен как установленный вручную.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s уже помечен как установленный автоматически.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s уже помечен как зафиксированный.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s уже помечен как не зафиксированный.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s помечен как зафиксированный.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Отмена фиксации для %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" "Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -755,7 +755,7 @@ msgstr "" "В справочных страницах apt-mark(8) и apt.conf(5)\n" "содержится подробная информация и описание параметров." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -803,52 +803,52 @@ msgstr "Невозможно размонтировать CD-ROM в %s, возм msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Неправильный URI, локальный URI не должен начинаться с //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Вход в систему" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Невозможно определить имя удалённого сервера" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Невозможно определить локальное имя" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сервер разорвал соединение и сообщил: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Команда USER не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Команда PASS не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -856,125 +856,127 @@ msgstr "" "Proxy-сервер указан, однако нет сценария входа в систему, Acquire::ftp::" "ProxyLogin пуст." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Команда «%s» сценария входа в систему завершилась неудачно, сервер сообщил: " "%s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Команда TYPE не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Допустимое время ожидания для соединения истекло" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Ошибка чтения" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Ответ переполнил буфер." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Ошибка записи" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Не удалось создать сокет" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "" "Не удалось присоединиться к сокету данных, время на установление соединения " "истекло" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Неудачно" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Невозможно присоединить пассивный сокет" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "Вызов getaddrinfo не смог получить сокет" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Невозможно присоединиться к сокету" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Не удалось принимать соединения на сокете" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Не удалось определить имя сокета" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Невозможно послать команду PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестное семейство адресов %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Команда EPRT не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Время установления соединения для сокета данных истекло" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Невозможно получить файл, сервер сообщил: «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Время ожидания соединения для сокета данных истекло" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача данных завершилась неудачно, сервер сообщил: «%s»" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Запрос" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Невозможно вызвать " @@ -1010,7 +1012,7 @@ msgstr "Не удаётся соединиться с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" @@ -1040,38 +1042,38 @@ msgstr "Что-то странное произошло при определе msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1079,117 +1081,117 @@ msgstr "" "Следующие подписи не могут быть проверены, так как недоступен открытый " "ключ:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Пустые файлы не могут быть допустимыми архивами" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Этот HTTP-сервер не поддерживает скачивание фрагментов файлов" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Внутренняя ошибка" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " "пакетами!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1198,23 +1200,23 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на " "%sB.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а параметр -y указан без --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " @@ -1222,11 +1224,11 @@ msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1237,19 +1239,19 @@ msgstr "" "Чтобы продолжить, введите фразу: «%s»\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Аварийное завершение." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Хотите продолжить?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1257,19 +1259,19 @@ msgstr "" "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " "или попытаться повторить запуск с ключом --fix-missing" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1286,15 +1288,15 @@ msgstr[2] "" "Следующие пакеты исчез из системы, так как все их файлы\n" "теперь берутся из других пакетов:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Замечание: это сделано автоматически и специально программой dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1312,15 +1314,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1332,7 +1334,7 @@ msgstr[1] "" msgstr[2] "" "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1341,20 +1343,20 @@ msgstr[0] "%lu пакет был установлен автоматически msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n" msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Для его удаления используйте «apt-get autoremove»." msgstr[1] "Для их удаления используйте «apt-get autoremove»." msgstr[2] "Для их удаления используйте «apt-get autoremove»." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -" "f install»:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1362,7 +1364,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», " "не указывая имени пакета, (или найдите другое решение)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1373,146 +1375,146 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Сломанные пакеты" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Предупреждение об аутентификации не принято в внимание.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Установить эти пакеты без проверки?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Установлен]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Установлен]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Установлен]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Установлен]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "но он не установлен" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " или" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1520,27 +1522,27 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" @@ -1549,7 +1551,7 @@ msgstr "не установлено до конца или удалено %lu п #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[Д/н]" @@ -1557,94 +1559,94 @@ msgstr "[Д/н]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "д" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "н" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Исправление зависимостей…" -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " не удалось." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Готово" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -" "f install»." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Расчёт обновлений…" -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Готово" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1656,43 +1658,43 @@ msgstr "" " Учтите, что блокировка не используется,\n" " поэтому нет полного соответствия с текущей реальной ситуацией!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Не удалось переименовать %s в %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "В кэше " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Получено:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Игн " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Ош " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Получено %sБ за %s (%sБ/c)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Обработка]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1705,19 +1707,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Невозможно сменить текущий каталог на %s" @@ -1746,11 +1748,11 @@ msgstr "Невозможно прочитать файл на зеркале «% msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" @@ -1792,7 +1794,7 @@ msgstr "" msgid "Merging available information" msgstr "Слияние доступной информации" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1815,41 +1817,41 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Невозможно определить версию debconf. Он установлен?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Список расширений, допустимых для пакетов, слишком длинен" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Ошибка обработки каталога %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Список расширений источников слишком длинен" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "" "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1935,26 +1937,26 @@ msgstr "" " -c=? Использовать указанный файл настройки\n" " -o=? Задать значение произвольному параметру настройки" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Совпадений не обнаружено" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов «%s» отсутствуют некоторые файлы" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД была повреждена, файл переименован в %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB устарела, попытка обновить %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1962,193 +1964,193 @@ msgstr "" "Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " "и создайте базу данных заново." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не удалось открыть DB файл %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "В архиве нет поля control" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Не удалось прочитать каталог %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Не удалось прочитать атрибуты %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Ошибки относятся к файлу " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Не удалось проследовать по ссылке %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Не удалось совершить обход дерева" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Не удалось прочесть ссылку %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Не удалось удалить %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не удалось создать ссылку %s на %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc — не удалось выделить память" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Не удалось открыть %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Не удалось прочесть файл переназначений (override) %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Неизвестный алгоритм сжатия «%s»" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" "Для получения сжатого вывода %s необходимо включить использования сжатия" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Не удалось создать FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Не удалось запустить порождённый процесс" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Процесс-потомок, производящий сжатие" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутренняя ошибка, не удалось создать %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Ошибка чтения во время вычисления MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2201,157 +2203,157 @@ msgstr "" " -c=? читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Не удалось создать каналы" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Не удалось выполнить gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Повреждённый архив" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Неправильная контрольная сумма Tar, архив повреждён" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Неверная сигнатура архива" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Ошибка чтения заголовка элемента архива" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Неправильный заголовок элемента архива %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Неправильный заголовок элемента архива" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Слишком короткий архив" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Не удалось прочитать заголовки архива" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode вызван для узла, который ещё используется" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Не удалось найти элемент хеша!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Не удалось создать diversion" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Внутренняя ошибка в AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Попытка изменения diversion, %s -> %s и %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Двойное добавление diversion %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Повторно указан файл настройки %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Слишком длинный путь %s" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Повторная распаковка %s" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Каталог %s входит в список diverted" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакет пытается писать в diversion %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Путь diversion слишком длинен" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Каталог %s был заменён не-каталогом" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Не удалось разместить узел в хеше" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Путь слишком длинен" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файлы заменяются содержимым пакета %s без версии" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Невозможно получить атрибуты %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Это неправильный DEB-архив — отсутствует составная часть «%s»" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Внутренняя ошибка, не удалось найти составную часть %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Не удалось прочесть содержимое control-файла" @@ -2411,213 +2413,208 @@ msgstr "" "отключено пользователем." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%liд %liч %liмин %liс" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%liч %liмин %liс" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%liмин %liс" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%liс" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Не найдено: %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестная аббревиатура типа: «%c»" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Открытие файла настройки %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксическая ошибка %s:%u: искажённый тег" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем " "уровне" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива «%s»" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Синтаксическая ошибка %s:%u: для директивы clear требуется третий параметр в " "качестве аргумента" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s… Ошибка!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s… Готово" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "…" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s… %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Неизвестный параметр командной строки «%c» [из %s]." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Не распознанный параметр командной строки %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Параметр командной строки %s — не логический переключатель \"да/нет\"" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Для параметра %s требуется аргумент." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Значение параметра %s должно иметь вид =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Для параметра %s требуется аргумент в виде целого числа, а не «%s»" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Параметр «%s» слишком длинный" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Смысл %s не ясен, используйте true или false." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Неверная операция %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Невозможно прочитать атрибуты точки монтирования %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Проблема закрытия gzip-файла %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Список файлов не может быть создан, так как «%s» не является каталогом" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2625,283 +2622,293 @@ msgstr "" "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное " "расширение" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Порождённый процесс %s получил сигнал %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Проблема закрытия gzip-файла %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Не удалось открыть файловый дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Не удалось создать IPC с порождённым процессом" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Не удалось выполнить компрессор " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Проблема закрытия файла %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема при удалении файла %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файла" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "переименовать не удалось, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Связка ключей в %s не установлена." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Кэш пакетов пуст" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Кэш пакетов повреждён" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Не поддерживаемая версия кэша пакетов" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Кэш пакетов повреждён, он слишком мал" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Эта версия APT не поддерживает систему версий «%s»" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Кэш пакетов был собран для другой архитектуры" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Зависит" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "ПредЗависит" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Предлагает" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Рекомендует" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Конфликтует" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Заменяет" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Замещает" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Ломает" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Улучшает" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "важный" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "необходимый" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "стандартный" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "необязательный" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "дополнительный" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Построение дерева зависимостей" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Версии-кандидаты" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Генерирование зависимостей" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Чтение информации о состоянии" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Не удалось открыть StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Не удалось записать временный StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Невозможно разобрать содержимое пакета %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет " "значения)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2910,12 +2917,12 @@ msgstr "" "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " "apt.conf о APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Не удалось настроить «%s»." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2928,19 +2935,19 @@ msgstr "" "Если вы действительно хотите продолжить, установите параметр APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не поддерживается индексный файл типа «%s»" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Пакет %s нуждается в переустановке, но найти архив для него не удалось." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2948,88 +2955,88 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Каталог списка %spartial отсутствует." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Архивный каталог %spartial отсутствует." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Невозможно заблокировать каталог %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Скачивается файл %li из %li (осталось %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Скачивается файл %li из %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не найден." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Система пакетирования «%s» не поддерживается" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип системы пакетирования" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Невозможно получить атрибуты %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3038,103 +3045,98 @@ msgstr "" "Значение «%s» недопустимо для APT::Default-Release, так как выпуск " "недоступен в источниках" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестный тип фиксации %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Кэш имеет несовместимую систему версий" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Произошла ошибка во время обработки %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Превышено допустимое количество имён пакетов, которое способен обработать " "APT." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Превышено допустимое количество версий, которое способен обработать APT." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Превышено допустимое количество описаний, которое способен обработать APT." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Превышено допустимое количество зависимостей, которое способен обработать " "APT." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Чтение списков пакетов" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "переименовать не удалось, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Хеш сумма не совпадает" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Не совпадает размер" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Неверная операция %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3143,16 +3145,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3161,12 +3163,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3176,12 +3178,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3190,78 +3192,78 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Невозможно разобрать содержимое файла Release (%s)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Отсутствуют разделы в файле Release (%s)" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Отсутствуют элементы Hash в файле Release (%s)" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Неправильный элемент «Valid-Until» в файле Release %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Неправильный элемент «Date» в файле Release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Размонтирование CD-ROM…\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском…\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM…\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Идентификация... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Найдена метка: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Размонтирование CD-ROM…\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Поиск на диске индексных файлов...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3270,7 +3272,7 @@ msgstr "" "Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и " "%zu для сигнатур\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3278,16 +3280,16 @@ msgstr "" "Не удалось найти ни одного файла пакетов; возможно это не диск Debian или с " "не той архитектурой?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Найден ярлык «%s»\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3296,34 +3298,34 @@ msgstr "" "Название диска: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Копирование списков пакетов…" -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Сохранено %i записей с %i несовпадающими файлами\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3340,38 +3342,38 @@ msgstr "Не удалось найти аутентификационную за msgid "Hash mismatch for: %s" msgstr "Не совпадает хеш сумма для: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Выпуск «%s» для «%s» не найден" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия «%s» для «%s» не найдена" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Не удалось найти задачу «%s»" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3380,57 +3382,57 @@ msgstr "" "Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так " "как в нём нет ни той, ни другой" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать самую новую версию из пакета «%s», так как он полностью " "виртуальный" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет " "кандидатов" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Не удалось выбрать установленную версию из пакета %s, так как он не " "установлен" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Отправка сценария решателю" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Отправка запроса решателю" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Подготовка к приёму решения" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Запустить внешний решатель" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Запускается dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3438,118 +3440,118 @@ msgstr "" "Некоторые индексные файлы не скачались. Они были проигнорированы или вместо " "них были использованы старые версии." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Устанавливается %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Настраивается %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Удаляется %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Выполняется полное удаление %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Уведомление об исчезновении %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Выполняется послеустановочный триггер %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Отсутствует каталог «%s»" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Не удалось открыть файл «%s»" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для настройки %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Невозможно записать в %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Действие прервано до его завершения" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Отчёты apport не записаны, так достигнут MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "проблемы с зависимостями — оставляем ненастроенным" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3557,7 +3559,7 @@ msgstr "" "Отчёты apport не записаны, так как сообщение об ошибке указывает на " "повторную ошибку от предыдущего отказа." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3565,7 +3567,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3573,7 +3575,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "памяти" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3582,14 +3584,14 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке об ошибке " "ввода-выводы dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3598,7 +3600,7 @@ msgstr "" "Не удалось выполнить блокировку управляющего каталога (%s); он уже " "используется другим процессом?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" @@ -3607,7 +3609,7 @@ msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3615,7 +3617,7 @@ msgstr "" "Работа dpkg прервана, вы должны вручную запустить «%s» для устранения " "проблемы. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Не заблокирован" diff --git a/po/sk.po b/po/sk.po index b20c0ef48..9dd96041c 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,155 +20,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verzie %s má nesplnené závislosti:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Celkom názvov balíkov: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Celkom štruktúr balíkov: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normálnych balíkov: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Čisto virtuálnych balíkov: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálnych balíkov: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Zmiešaných virtuálnych balíkov: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Chýbajúcich: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Celkom rôznych verzií: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Celkom rôznych popisov: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Celkom závislostí: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Celkom vzťahov ver/súbor: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Celkom vzťahov popis/súbor: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Celkom poskytnutých mapovaní: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Celkom globovaných reťazcov: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Celkom miesta závislých verzií: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Celkom jalového miesta: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Celkom priradeného miesta: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Súbor balíkov %s je neaktuálny." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Musíte zadať aspoň jeden vyhľadávací vzor" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark " "showauto“." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Nedá sa nájsť balík %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Súbory balíka:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pripevnené balíky:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(nenájdené)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Nainštalovaná verzia: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(žiadna)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Pripevnený balík:" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pre %s skompilovaný %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -239,28 +239,28 @@ msgstr "" "Ďalšie informácie nájdete v manuálových stránkach apt-cache(8)\n" "a apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte disk do mechaniky a stlačte Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Pripojenie „%s“ na „%s“ zlyhalo" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Zopakujte tento postup pre všetky CD v sade diskov." @@ -296,47 +296,47 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je označený ako manuálne nainštalovaný.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je označený ako automaticky nainštalovaný.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -344,19 +344,19 @@ msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a " "„apt-mark manual“." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsť zdrojový balík pre %s" @@ -383,80 +383,80 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na " "zostavenie" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +465,17 @@ msgstr "" "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení " "nájdete v apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti na zostavenie %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,20 +484,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -506,7 +506,7 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, " "nedokáže splniť požiadavky na verziu" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -514,30 +514,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -625,7 +625,7 @@ msgstr "" "a apt.conf(5).\n" " Tento APT má schopnosti posvätnej kravy.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" @@ -634,7 +634,7 @@ msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové text msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -647,53 +647,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s nemožno označiť, pretože nie je nainštalovaný.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s už bol označený ako manuálne nainštalovaný.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s už bol označený ako automaticky nainštalovaný.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s bol už nastavený na podržanie.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s bol už nastavený na nepodržanie.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s je označený na podržanie.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Zrušené podržanie %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Vykonanie dpkg zlyhalo. Ste root?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -740,7 +740,7 @@ msgstr "" " -o=? Nastaviť ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n" "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf(5)." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -788,52 +788,52 @@ msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa." msgid "Disk not found." msgstr "Disk sa nenašiel." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Súbor sa nenašiel" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokálne URI nesmie začínať s //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Prihlasovanie" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Nedá sa zistiť názov druhej strany" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Nedá sa zistiť lokálny názov" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Server zamietol naše spojenie s chybou: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Zlyhalo zadanie hesla, server odpovedal: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -841,121 +841,123 @@ msgstr "" "Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::" "ProxyLogin je prázdny." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Zlyhalo zadanie typu, server odpovedal: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Uplynul čas spojenia" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Chyba pri čítaní" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Odpoveď preplnila zásobník." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Chyba pri zápise" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Nedá sa vytvoriť socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Chyba" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Nedá sa pripojiť pasívny socket." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal počúvajúci socket" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Nedá sa nadviazať socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Na sockete sa nedá počúvať" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Názov socketu sa nedá zistiť" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Príkaz PORT sa nedá odoslať" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznáma rodina adries %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Uplynulo spojenie dátového socketu" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Uplynula doba dátového socketu" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos dát zlyhal, server odpovedal „%s“" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Nedá sa vyvolať " @@ -991,7 +993,7 @@ msgstr "Nedá sa pripojiť k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" @@ -1021,36 +1023,36 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nedá sa pripojiť k %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1058,95 +1060,95 @@ msgstr "" "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " "kľúč:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Prázdne súbory nemôžu byť platné archívy" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poškodenú podporu rozsahov" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Vnútorná chyba" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages." @@ -1154,52 +1156,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuť %sB archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tejto operácii sa na disku uvoľní %sB.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1210,19 +1212,19 @@ msgstr "" "Ak chcete pokračovať, opíšte frázu „%s“\n" " ?]" -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Prerušené." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Chcete pokračovať?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1230,19 +1232,19 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" "fix-missing" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviť." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Inštalácia sa prerušuje." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1259,15 +1261,15 @@ msgstr[2] "" "Nasledovné balíky zmizli z vášho systému, pretože\n" "všetky súbory boli prepísané inými balíkmi:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Pozn.: Toto robí dpkg automaticky a zámerne." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1285,15 +1287,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnútorná chyba, AutoRemover niečo pokazil" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1306,7 +1308,7 @@ msgstr[1] "" msgstr[2] "" "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1318,18 +1320,18 @@ msgstr[1] "" msgstr[2] "" "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“." msgstr[1] "Na ich odstránenie použite „apt-get autoremove“." msgstr[2] "Na ich odstránenie použite „apt-get autoremove“." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1337,7 +1339,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo " "navrhnite riešenie)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1349,145 +1351,145 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Poškodené balíky" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Nainštalovať tieto nekontrolované balíky?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " alebo" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1495,27 +1497,27 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" @@ -1524,7 +1526,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1532,92 +1534,92 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " zlyhalo." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviť" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Sada na aktualizáciu sa nedá minimalizovať" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Hotovo" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiť -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Hotovo" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1629,43 +1631,43 @@ msgstr "" " Tiež pamätajte, že zamykanie je deaktivované, takže\n" " sa nespoliehajte na to že to bude platiť v reálnej situácii!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Premenovanie %s na %s zlyhalo" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Už existuje " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Získava sa:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Chyba " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%sB sa stiahlo za %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Prebieha spracovanie]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1678,19 +1680,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Nedá sa načítať %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Nedá sa prejsť do %s" @@ -1719,11 +1721,11 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" @@ -1763,7 +1765,7 @@ msgstr "" msgid "Merging available information" msgstr "Zlučujú sa dostupné informácie" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1787,40 +1789,40 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovať" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Zoznam rozšírení balíka je príliš dlhý" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Chyba pri spracovávaní adresára %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Zoznam zdrojových rozšírení je príliš dlhý" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Chyba pri zapisovaní hlavičky do súboru" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1900,26 +1902,26 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nevyhovel žiaden výber" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je narušená, súbor je premenovaný na %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1927,192 +1929,192 @@ msgstr "" "Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte " "odstrániť a znovu vytvoriť databázu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nedá sa otvoriť DB súbor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiť" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Archív nemá riadiaci záznam" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Nedá sa získať kurzor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Adresár %s sa nedá čítať\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s sa nedá vyhodnotiť\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Chyby sa týkajú súboru " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Chyba pri preklade %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Prechod stromom zlyhal" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s sa nedá otvoriť" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Odlinkovanie %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Nie je možné vykonať readlink %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Nie je možné vykonať unlink %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nepodarilo sa zlinkovať %s s %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Archív neobsahuje pole „package“" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žiadnu položku override\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žiadnu položku „source override“\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá žiadnu položku „binary override“\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Zlyhal pokus o pridelenie pamäti" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nedá sa otvoriť %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Skomolený „override“ %s riadok %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nepodarilo sa prečítať „override“ súbor %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Skomolený „override“ %s riadok %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Skomolený „override“ %s riadok %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Skomolený „override“ %s riadok %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámy kompresný algoritmus „%s“" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Zlyhalo vytvorenie FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Volanie fork() zlyhalo" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Komprimovať potomka" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Chyba čítania pri výpočte MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2164,157 +2166,157 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Vytvorenie rúry zlyhalo" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Spustenie gzip zlyhalo " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Porušený archív" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznáma TAR hlavička typu %u, člen %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Neplatný podpis archívu" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Chyba pri čítaní záhlavia prvku archívu" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Neplatná hlavička prvku archívu %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Neplatné záhlavie prvku archívu" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Archív je príliš krátky" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Chyba pri čítaní hlavičiek archívu" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Hašovací prvok sa nedá nájsť!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nedá sa alokovať diverzia" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Vnútorná chyba pri AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojité pridanie diverzie %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je príliš dlhá" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s sa rozbaľuje viackrát" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Adresár %s je divertovaný" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Diverzná cesta je príliš dlhá" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresár %s sa nahradí neadresárom" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Nedá sa nájsť uzol na adrese jeho hašu" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Cesta je príliš dlhá" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Súbor %s/%s prepisuje ten z balíka %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Nedá sa vyhodnotiť %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Toto nie je platný DEB archív, chýba časť „%s“" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vnútorná chyba, nedá sa nájsť časť %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Nespracovateľný riadiaci súbor" @@ -2374,485 +2376,490 @@ msgstr "" "používateľ." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li d %li h %li min %li s" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%li h %li min %li s" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%li min %li s" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%li s" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Voľba %s nenájdená" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná skratka typu: „%c“" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Otvára sa konfiguračný súbor %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Skomolená značka" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Syntaktická chyba %s:%u: direktíva clear vyžaduje ako argument strom volieb" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Chyba!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Hotovo" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Nezrozumiteľný parameter %s na príkazovom riadku" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Voľba %s vyžaduje argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Voľba „%s“ je príliš dlhá" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Nezrozumiteľný význam %s, skúste true alebo false. " -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Neplatná operácia %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiť" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Nedá sa vykonať stat() CD-ROM" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problém pri zatváraní gzip súboru %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Súbor zámku %s sa nedá otvoriť" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získať" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože to nie je obyčajný súbor" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože nemá príponu názvu súboru" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s dostal signál %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problém pri zatváraní gzip súboru %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Nedá sa otvoriť súbor %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Nedá sa otvoriť popisovač súboru %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Nedá sa vytvoriť podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Nepodarilo sa spustiť kompresor " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problém pri zatváraní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém pri odstraňovaní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "premenovanie zlyhalo, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Vyrovnávacia pamäť balíkov je prázdna" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený, je príliš malý" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tento APT nepodporuje systém na správu verzií „%s“" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Predzávisí na" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Odporúča" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Nahrádza" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Zneplatňuje" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Kazí" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Rozširuje" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "dôležitý" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "požadovaný" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "štandardný" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "voliteľný" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostí" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Kandidátske verzie" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Generovanie závislostí" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Načítavajú sa stavové informácie" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Nie je možné otvoriť StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Nie je možné zapísať dočasný StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovať (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2861,12 +2868,12 @@ msgstr "" "Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v " "man 5 apt.conf pod APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Nedá sa nakonfigurovať „%s“." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2877,18 +2884,18 @@ msgstr "" "kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete " "naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexový súbor typu „%s“ nie je podporovaný" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2896,88 +2903,88 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Adresár zoznamov %spartial chýba." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Archívny adresár %spartial chýba." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Adresár %s sa nedá zamknúť" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Sťahuje sa %li. súbor z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Systém balíkov „%s“ nie je podporovaný" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiť vhodný typ systému balíkov" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Nie je možné vykonať stat %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Nedá sa načítať zoznam zdrojov." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -2986,99 +2993,94 @@ msgstr "" "„%s“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie " "nie je dostupné v zdrojoch" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Nezrozumiteľné pridržanie typu %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "premenovanie zlyhalo, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Nezhoda kontrolných haš súčtov" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Neplatná operácia %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3087,16 +3089,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3105,12 +3107,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3120,12 +3122,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3134,78 +3136,78 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Nedá spracovať súbor Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Žiadne sekcie v Release súbore %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Chýba položka „Hash“ v súbore Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Chýba položka „Valid-Until“ v súbore Release %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Chýba položka „Date“ v súbore Release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Použije sa prípojný bod CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM sa odpája...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identifikuje sa..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Uložená menovka: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM sa odpája...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Na disku sa hľadajú indexové súbory...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3214,7 +3216,7 @@ msgstr "" "Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov " "prekladov a %zu signatúr\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3222,16 +3224,16 @@ msgstr "" "Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom " "alebo je pre nesprávnu architektúru?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Nájdená menovka: „%s“\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Neplatný názov, skúste znova.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3240,34 +3242,34 @@ msgstr "" "Názov tohto disku je: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" @@ -3282,37 +3284,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Nebolo možné nájsť úlohu „%s“" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3321,56 +3323,56 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je " "nainštalovaný" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Poslať scénár riešiteľovi" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Poslať požiadavku riešiteľovi" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Pripraviť sa na prijatie riešenia" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Spustiť externého riešiteľa" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Spúšťa sa dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3378,118 +3380,118 @@ msgstr "" "Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa " "použili staršie verzie." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Inštaluje sa %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Úplne sa odstraňuje %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Zaznamenali sme zmiznutie %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Vykonáva sa spúšťač post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Adresár „%s“ chýba" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Nedá sa otvoriť súbor „%s“" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Balík „%s“ je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Do %s sa nedá zapisovať" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3497,7 +3499,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v " "nadväznosti na predošlé zlyhanie." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3505,7 +3507,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3513,7 +3515,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " "pamäte" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3522,33 +3524,33 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Nie je zamknuté" diff --git a/po/sl.po b/po/sl.po index 00c581d77..14b7c53c9 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,153 +20,153 @@ msgstr "" "X-Poedit-Language: Slovenian\n" "X-Poedit-SourceCharset: utf-8\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s različica %s ima nerešene odvisnosti:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Vseh imen paketov: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Skupno struktur paketov : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Običajni paketi: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Čisti navidezni paketi: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Posamezni navidezni paketi: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Mešani navidezni paketi: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Manjka: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Vseh različic: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Skupno različnih opisov: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Vseh odvisnosti: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Vseh povezav Raz/Dat: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Skupno razmerij opisov/datotek: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Vseh dobljenih preslikav: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Vseh razširjenih nizov: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Celotna velikost z odvisnostmi različice: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Celotna ohlapna velikost: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Celotna velikost, izračunana za: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Datoteka paketa %s ni usklajena." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Noben paket ni bil najden" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Podati morate vsaj en iskalni vzorec" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Ni mogoče najti paketa %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogoč" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Pripeti paketi:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(ni najdeno)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Nameščen: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(brez)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Bucika paketa: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Preglednica različic:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s kodno preveden na %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -237,28 +237,28 @@ msgstr "" "Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt." "conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Vstavite disk v pogon in pritisnite vnosno tipko" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Priklapljanje '%s' na '%s' je spodletelo" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki." @@ -294,47 +294,47 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je bil nastavljen na ročno nameščen.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je nastavljen na samodejno nameščen.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -342,20 +342,20 @@ msgstr "" "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark " "manual'." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka, reševalnik težav je pokvaril stvari" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Ni mogoče zakleniti mape prejemov" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" @@ -380,80 +380,80 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -462,17 +462,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -480,20 +480,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +502,7 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s ne more zadostiti zahtev različice" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,30 +511,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -621,7 +621,7 @@ msgstr "" " sources.list(5) in apt.conf(5). \n" " Ta APT ima moči super krav.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -631,7 +631,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -644,53 +644,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "paket %s ne more biti označen, ker ni nameščen.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "paket %s je bil že nastavljen na ročno nameščen.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "paket %s je bil že nastavljen kot samodejno nameščen.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "paket %s je bil že nastavljen kot na čakanju.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "paket %s je nastavljen kot na čakanju.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Čakanje za %s je bilo preklicano.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -736,7 +736,7 @@ msgstr "" " -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n" "Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf(5)." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -784,52 +784,52 @@ msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi." msgid "Disk not found." msgstr "Diska ni mogoče najti." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Neveljaven URI. Krajevni URI-ji se morajo začeti z //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Prijavljanje" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Ni mogoče ugotoviti imena gostitelja" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Ni mogoče določiti krajevnega imena" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Strežnik je zavrnil povezavo in sporočil: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -837,121 +837,123 @@ msgstr "" "Naveden je bil posredniški strežnik, ne pa tudi prijavni skript. Acquire::" "ftp::ProxyLogin je prazen." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Povezava je zakasnela" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Strežnik je zaprl povezavo" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Napaka branja" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Odgovor je prekoračil predpomnilnik." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Napaka pisanja" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Ni mogoče ustvariti vtiča" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela." -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Spodletelo" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Ni mogoče povezat pasivnega vtiča." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Ni mogoče povezati vtiča" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Ni mogoče poslušati na vtiču" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Ni mogoče določiti imena vtiča" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Ni mogoče poslati ukaza PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznan naslov družine %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ni uspel, strežnik je odgovoril: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Povezava podatkovne vtičnice je zakasnela" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Ni mogoče sprejeti povezave" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Težava med razprševanjem datoteke" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Podatkovna vtič je potekel" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Poizvedba" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Ni mogoče klicati " @@ -987,7 +989,7 @@ msgstr "Ni se mogoče povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Povezovanje z %s" @@ -1017,132 +1019,132 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoče povezati z %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Najden je bil vsaj en neveljaven podpis." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Neznana napaka med izvajanjem gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Naslednji podpisi so bili neveljavni:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Napaka med branjem s strežnika" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Povezava je zakasnela" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Napaka med pisanjem v izhodno datoteko" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Čakanje na glave" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Neveljavna vrstica glave" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Strežnik HTTP je poslal glavo z neveljavno dolžino vsebine" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Napačni podatki glave" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Notranja napaka" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka, Urejanje se ni končalo" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na apt@packages." @@ -1150,52 +1152,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s je premalo prostora." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1206,19 +1208,19 @@ msgstr "" "Za nadaljevanje vtipkajte frazo '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Prekini." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Ali želite nadaljevati?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Prejem nekaterih datotek ni uspel" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1226,19 +1228,19 @@ msgstr "" "Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Ni mogoče popraviti manjkajočih paketov." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1258,17 +1260,17 @@ msgstr[3] "" "Naslednji paketi so izginili z vašega sistema, ker so vse\n" "datoteke prepisali drugi paketi:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Opomba: To je dpkg storil samodejno in namenoma." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Program ne bi smel brisati stvari, ni mogoče zagnati " "SamodejnegaOdstranjevalnika" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1287,15 +1289,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1307,7 +1309,7 @@ msgstr[2] "" "Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:" msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1317,7 +1319,7 @@ msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n" msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n" msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev." @@ -1325,11 +1327,11 @@ msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev." msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev." msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1337,7 +1339,7 @@ msgstr "" "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "navedite rešitev)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1349,145 +1351,145 @@ msgstr "" ", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n" " iz Prihajajočega." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameščeni:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Priporočeni paketi:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Opozorilo overitve je bilo prepisano.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Nekaterih paketkov bi bilo mogoče overiti" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Ali želite te pakete namestiti brez preverjanja?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ali" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1495,27 +1497,27 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" @@ -1524,7 +1526,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1532,93 +1534,93 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " spodletelo." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Ni mogoče popraviti odvisnosti" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Opravljeno" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Nerešene odvisnosti. Poskusite uporabiti -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Ukaz update ne sprejema argumentov" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Preračunavanje nadgradnje ... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Opravljeno" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1630,43 +1632,43 @@ msgstr "" " Zaklepanje je onemogočeno, zato se ne zanašajte\n" " na pomembnost trenutnega pravega stanja!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Ni mogoče preimenovati %s v %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Zadetek " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Dobi:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Prezr " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Nap " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Pridobljenih %sB v %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Delo]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1679,19 +1681,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Ni mogoče brati %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Ni mogoče spremeniti v %s" @@ -1720,11 +1722,11 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" @@ -1765,7 +1767,7 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat" msgid "Merging available information" msgstr "Združevanje razpoložljivih podaktov" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1789,40 +1791,40 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoče pisati na %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Seznam razširitev paketov je predolg" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Napaka med obdelavo mape %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Seznam razširitev virov je predolg" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Napaka med pisanjem glave v datoteko vsebine" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Napaka med obdelavo vsebine %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1902,26 +1904,26 @@ msgstr "" " -c=? prebere to nastavitveno datoteko\n" " -o=? nastavi poljubno možnost nastavitve" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Nobena izbira se ne ujema" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "PZ je star, poskušanje nadgradnje %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1929,192 +1931,192 @@ msgstr "" "Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše " "različice apt, podatkovno zbirko odstranite in jo znova ustvarite." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni mogoče odprti datoteke PZ %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Napaka med določitvijo %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Ni mogoče najti kazalke" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "O: ni mogoče brati mape %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "O: Ni mogoče določiti %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "O: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "N: Napake se sklicujejo na datoteko " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Ni mogoče razrešiti %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Hoja drevesa je spodletela" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Ni mogoče odprti %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " RazVeži %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Napaka med branjem povezave %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Napaka med odvezovanjem %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Napaka med povezovanjem %s in %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Dosežena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prepisanega vnosa\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrževalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s nima izvornega vnosa prepisa\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima tudi binarnega vnosa prepisa\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Napaka med dodeljevanjem pomnilnika" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ni mogoče odpreti %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Napaka med branjem prepisane datoteke %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznan algoritem stiskanja '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Stisnjen izhod %s potrebuje niz stiskanja" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Ustvarjanje DATOTEKE* ni uspelo" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Vejitev ni uspela" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Podrejeni predmet stiskanja" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Notranja napaka. Ni mogoče ustvariti %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "VI podopravila/datoteke je spodletel" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Med računanjem MD5 ni mogoče brati" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Napaka med odvezovanjem %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoče preimenovati %s v %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2168,157 +2170,157 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Ni mogoče ustvariti pip" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Ni mogoče izvesti gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Pokvarjen arhiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznana vrsta glave TAR %u, član %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Neveljaven podpis arhiva" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Napaka med branjem glave člana arhiva" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Neveljavna glava arhiva člana %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Neveljavna glava člana arhiva" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arhiv je prekratek" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Glav arhiva ni mogoče brati" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode je poklical stabilno povezano vozlišče" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Ni mogoče najti razpršenega elementa!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Ni mogoče dodeliti odklona" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Notranja napaka v AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojni seštevek odklona %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Zapisovanje datoteke %s je spodletelo" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Napaka med zapiranjem datoteke %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Pot %s je predolga" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Odpakiranje %s več kot enkrat" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Mapa %s je odklonjena" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paket poskuša pisati v tarčo odklona %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Pot odklona je predloga" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mapa %s je bil zamenjana z ne-mapo" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Pot je predolga" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Prepiši zadetek paketa brez vnosa različice za %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Ni mogoče določiti %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "To ni veljaven arhiv DEB. Manjka član '%s'." -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Notranja napaka. Ni mogoče najti člana %s." -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Nadzorne datoteke ni mogoče razčleniti" @@ -2377,490 +2379,495 @@ msgstr "" "Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Izbire %s ni mogoče najti" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Neprepoznana vrsta okrajšave: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Skladenjska napaka %s:%u: Blok se začne brez imena." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka." -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo." -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnji ravni." -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Skladenjska napaka %s:%u: Vključeno od tu" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Skladenjska napaka %s:%u: počisti ukaz zahteva drevo možnosti kot argument" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Napaka!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Narejeno" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s ... Narejeno" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Možnost ukazne vrstice '%c' [iz %s] ni poznana." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Možnosti ukazne vrstice %s ni mogoče razumeti" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Možnost ukazne vrstice %s ni boolova vrednost" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Možnost %s zahteva argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Možnost %s: Določilo predmeta nastavitve zahtevajo =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Možnost %s zahteva celoštevilski argument, ne '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Možnost '%s' je predolga" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Pomena %s ni mogoče razumeti, poskusite pravilno ali napačno." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Neveljavno opravilo %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ni mogoče določiti priklopne točke %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Ni mogoče določiti CD-ROM-a" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Težava med zapiranjem gzip datoteke %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoče odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoče zakleniti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Pod-opravilo %s je prejelo segmentacijsko napako." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Pod-opravilo %s je prejelo signal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Pod-opravilo %s se je nepričakovano zaključilo" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Težava med zapiranjem gzip datoteke %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Ni mogoče odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Ni mogoče odpreti opisnika datotek %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Ni mogoče ustvariti podopravila IPD" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Ni mogoče izvesti stiskanja " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Težava med usklajevanjem datoteke" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "preimenovanje je spodletelo, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "V %s ni nameščenih zbirk ključev." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Prazen predpomnilnik paketov" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ta APT ne podpira sistema različic '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Odvisen od" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Predodvisen od" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Priporoča" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Priporoča" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "V sporu z" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Zamenja" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Zastara" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Pokvari" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Izboljša" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "pomembno" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "obvezno" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "običajni" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "izbirno" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "dodatno" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Različice kandidatov" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Branje podatkov o stanju" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Odpiranje DatotekeStanja %s je spodletelo" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Pisanje začasne DatotekeStanja %s je spodletelo" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče " "razčleniti)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima " "vrednosti)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Odpiranje %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2869,12 +2876,12 @@ msgstr "" "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod " "APT::Immediate-Configure za podrobnosti. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Ni mogoče nastaviti '%s' " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2885,18 +2892,18 @@ msgstr "" "zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite " "nadaljevati, vključite možnost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Vrsta datoteke s kazalom '%s' ni podprta" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2904,88 +2911,88 @@ msgstr "" "Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda " "povzročili zadržani paketi." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Mapa seznama %spartial manjka." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Mapa arhivov %spartial manjka." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Mape %s ni mogoče zakleniti" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Pridobivanje datoteke %li od %li (%s preostalo)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Pridobivanje datoteke %li od %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Način %s se ni začel pravilno" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Ni mogoče določiti %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "V sources.list morate vstaviti URI-je z viri" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Ni mogoče odprti ali razčleniti seznama paketov ali datoteke stanja." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Za odpravljanje težav poskusite zagnati apt-get update." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoče brati." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -2994,97 +3001,92 @@ msgstr "" "Vrednost '%s' je neveljavna za APT::Default-Release in zato takšna izdaja ni " "na voljo v virih" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Ni mogoče razumeti vrste bucike %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Prednost bucike ni navedena ali pa je nič." -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Predpomnilnik ima neustrezen sistem različic" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoče določiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Branje seznama paketov" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Napaka VI med shranjevanjem predpomnilnika virov" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "preimenovanje je spodletelo, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Neujemanje vsote razpršil" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Neujemanje velikosti" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Neveljavno opravilo %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3093,16 +3095,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3111,12 +3113,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3126,12 +3128,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3140,12 +3142,12 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3153,67 +3155,67 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket " "%s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Ni mogoče razčleniti Release datoteke %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Ni izbir v Release datoteki %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Ni vnosa razpršila v Release datoteki %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Neveljavne vnos 'Datum' v Release datoteki %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljanje CD-ROM-ove priklopne točke %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Odklapljanje CD-ROM-a ...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Čakanje na disk ...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Priklapljanje CD-ROM-a ...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identificiranje ... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Shranjena oznaka: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Odklapljanje CD-ROM-a ...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Preiskovanje diska za datoteke kazala ...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3222,7 +3224,7 @@ msgstr "" "Najdenih je bilo %zu kazal paketov, %zu kazal virov, %zu kazalov prevodov in " "%zu podpisov\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3230,16 +3232,16 @@ msgstr "" "Nobenih datotek paketov ni mogoče najti, morda to ni disk Debian ali pa je " "arhitektura napačna?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Najdena je bila oznaka '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "To ni veljavno ime, poskusite znova.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3248,34 +3250,34 @@ msgstr "" "Ta disk se imenuje: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Pisanje novega seznama virov\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisanih je bilo %i zapisov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3292,37 +3294,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Različice '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Ni mogoče najti naloge '%s'" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3331,53 +3333,53 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, 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" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Pošlji scenarij reševalniku" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Pošlji zahtevo reševalniku" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Priprava za rešitev prejemanja" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Izvedi zunanji reševalnik" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Poganjanje dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3385,119 +3387,119 @@ msgstr "" "Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile " "namesto njih uporabljene stare." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Nameščanje %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Odstranjevanje %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "%s je izginil" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Poganjanje sprožilca po namestitvi %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Mapa '%s' manjka" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Ni mogoče odpreti datoteke '%s'" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Pripravljanje %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Razširjanje %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Pripravljanje na nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s je bil nameščen" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravljanje na odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s je bil odstranjen" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravljanje na popolno odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni mogoče pisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "težave odvisnosti - puščanje nenastavljenega" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3505,7 +3507,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " "navezujočo napako iz predhodne napake." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3513,7 +3515,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "polnega diska" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3521,7 +3523,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3529,14 +3531,14 @@ msgstr "" "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo " "na krajevnem sistemu" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "dpkg V/I" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3544,20 +3546,20 @@ msgid "" msgstr "" "Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Ni zaklenjeno" diff --git a/po/sv.po b/po/sv.po index 9a5addfcf..3cb891ddd 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,154 +19,154 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" "Paketet %s med version %s har ett beroende som inte kan tillfredsställas:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Totalt antal paketnamn: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Totala paketstrukturer: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Vanliga paket: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Helt virtuella paket: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Enstaka virtuella paket: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Blandade virtuella paket: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Saknade: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Totalt antal olika versioner: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Totalt antal olika beskrivningar: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Totalt antal beroenden: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Totalt antal version/filrelationer: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Totalt antal beskrivning/filrelationer: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Totalt antal tillhandahållningsmarkeringar: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Totalt antal sökmönstersträngar: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Totalt utrymme för versionsberoenden: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Totalt bortkastat utrymme: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogöras för: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Paketfilen %s är inte synkroniserad." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Inga paket hittades" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Du måste ange minst ett sökmönster" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Fastnålade paket:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(hittades inte)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Paketnålning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s för %s kompilerad den %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -240,28 +240,28 @@ msgstr "" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\"" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Mata in en skiva i enheten och tryck på Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Misslyckades med att montera \"%s\" till \"%s\"" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning." @@ -297,65 +297,65 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\"" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s är satt till automatiskt installerad.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren förstörde någonting" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" @@ -381,95 +381,95 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +478,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +487,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +503,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,31 +512,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -624,7 +624,7 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Du måste ange minst ett paket att hämta källkod för" @@ -633,7 +633,7 @@ msgstr "Du måste ange minst ett paket att hämta källkod för" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -646,53 +646,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "men det är inte installerat" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s är satt till automatiskt installerad.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s är satt till manuellt installerad.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Misslyckades med att öppna %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -719,7 +719,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -767,52 +767,52 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." msgid "Disk not found." msgstr "Skivan hittades inte." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Filen hittades inte" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Ogiltig URI, lokala URI:er får inte börja med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Loggar in" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Kunde inte fastställa namnet på partnern" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Kunde inte fastställa det lokala namnet" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Servern nekade anslutningen och sade: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER misslyckades, servern sade: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS misslyckades, servern sade: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -820,122 +820,124 @@ msgstr "" "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::" "ProxyLogin är tom." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Tidsgränsen för anslutningen överskreds" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Läsfel" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Ett svar spillde bufferten." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Skrivfel" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Kunde inte skapa ett uttag (socket)" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Misslyckades" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Kunde inte ansluta passivt uttag (socket)." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Kunde inte binda ett uttag (socket)" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Kunde inte lyssna på uttaget (socket)" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Kunde inte fastställa uttagets namn (socket)" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Kunde inte sända PORT-kommando" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Okänd adressfamilj %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT misslyckades, servern sade: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hämta filen, servern sade \"%s\"" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataöverföringen misslyckades, servern sade \"%s\"" # Statusmeddelande, byter från substantiv till verb #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Frågar" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Kunde inte starta " @@ -973,7 +975,7 @@ msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@ -1005,39 +1007,39 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns " "fingeravtryck?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1045,95 +1047,95 @@ msgstr "" "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är " "tillgänglig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Väntar på rubriker" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Felaktig rubrikrad" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern sände ett ogiltigt svarshuvud" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Internt fel" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages anropades med trasiga paket!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages." @@ -1141,21 +1143,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behöver hämta %sB/%sB arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behöver hämta %sB arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1163,31 +1165,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Ja, gör som jag säger!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1199,19 +1201,19 @@ msgstr "" " ?] " # Visas då man svarar nej -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Avbryter." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Vill du fortsätta?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Misslyckades med att hämta vissa filer" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1219,19 +1221,19 @@ msgstr "" "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" "fix-missing." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte för tillfället" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Kunde inte korrigera saknade paket." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Avbryter installationen." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1245,16 +1247,16 @@ msgstr[1] "" "Följande paket har försvunnit från ditt system eftersom\n" "alla filer har skrivits över av andra paket:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Observera: Detta sker med automatik och vid behov av dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1272,15 +1274,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Följande information kan vara till hjälp för att lösa situationen:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, AutoRemover förstörde något" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1291,7 +1293,7 @@ msgstr[0] "" msgstr[1] "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1301,18 +1303,18 @@ msgstr[0] "" msgstr[1] "" "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Använd \"apt-get autoremove\" för att ta bort dem." msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1320,7 +1322,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1332,145 +1334,145 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Trasiga paket" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Följande paket kunde inte autentiseras!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsvarning åsidosatt.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Installera dessa paket utan verifiering?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installerat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Installerat]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Installerat]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Installerat]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "men det är inte installerat" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1478,27 +1480,27 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" @@ -1507,7 +1509,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[J/n]" @@ -1515,91 +1517,91 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Korrigerar beroenden..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " misslyckades." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Kunde inte korrigera beroenden" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsättningen" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Färdig" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsställda beroenden. Prova med -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Färdig" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1611,48 +1613,48 @@ msgstr "" " Tänk också på att låsningen är inaktiverad, så\n" " förlita dig inte på relevansen till den verkliga situationen!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Misslyckades med att byta namn på %s till %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" # Måste vara tre bokstäver(?) # "Hit" = aktuell version är fortfarande giltig -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Bra " # "Get:" = hämtar ny version -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Läs:" # "Ign" = hoppar över -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ign " # "Err" = fel vid hämtning -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Fel " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Hämtade %sB på %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Arbetar]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1665,20 +1667,20 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" # Felmeddelande för misslyckad chdir -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte byta till %s" @@ -1707,11 +1709,11 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "[Mirror: %s]" msgstr "[Spegel: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" @@ -1753,7 +1755,7 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig msgid "Merging available information" msgstr "Sammanfogar tillgänglig information" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1777,40 +1779,40 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Listan över filtillägg för Packages är för lång" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Fel vid behandling av katalogen %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Listan över filtillägg för Sources är för lång" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Fel vid skrivning av rubrik till innehållsfil" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Fel vid behandling av innehållet %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1891,26 +1893,26 @@ msgstr "" " -c=? Läs denna konfigurationsfil\n" " -o=? Ställ in en godtycklig konfigurationsflagga" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Inga val träffades" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Några filer saknas i paketfilsgruppen \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var skadad, filen omdöpt till %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB är gammal, försöker uppgradera %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1918,118 +1920,118 @@ msgstr "" "DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar " "från en äldre version av apt." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunde inte öppna DB-filen %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades med att ta status på %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Kunde inte få tag i någon markör" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "V: Kunde inte läsa katalogen %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "V: Kunde inte ta status på %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "V: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "F: Felen gäller filen " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades med att slå upp %s" # ??? -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Trädvandring misslyckades" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Misslyckades med att öppna %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Avlänka %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Misslyckades med att läsa länken %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Misslyckades med att länka ut %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Misslyckades med att länka %s till %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgränsen på %sB nåddes.\n" # Fält vid namn "Package" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för paketet %s är %s ej %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen källåsidosättningspost\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binär åsidosättningspost\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades med att allokera minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kunde inte öppna %s" @@ -2037,79 +2039,79 @@ msgstr "Kunde inte öppna %s" # parametrar: filnamn, radnummer #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Misslyckades med att läsa åsidosättningsfilen %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Okänd komprimeringsalgoritm \"%s\"" # ??? -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Misslyckades med att skapa FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Misslyckades med att grena process" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Barnprocess för komprimering" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Internt fel, misslyckades med att skapa %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "In/ut för underprocess/fil misslyckades" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Misslyckades med att läsa vid beräkning av MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn på %s till %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2162,157 +2164,157 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Misslyckades med att skapa rör" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Misslyckades med att köra gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Skadat arkiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Okänd TAR-rubriktyp %u, del %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Ogiltig arkivsignatur" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Fel vid läsning av rubrik för arkivdel" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Ogiltig arkivdelsrubrik %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Ogiltigt arkivdelsrubrik" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arkivet är för kort" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Misslyckades med att läsa arkivrubriker" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode anropat på fortfarande länkad nod" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Misslyckades med att hitta hash-elementet!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Misslyckades med att allokera omdirigering" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internt fel i AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Omdirigeringen %s -> %s inlagd två gånger" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades med att skriva filen %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades med att stänga filen %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Sökvägen %s är för lång" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Packar upp %s flera gånger" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s är omdirigerad" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Omdirigeringssökvägen är för lång" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalogen %s ersätts av en icke-katalog" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Misslyckades med att hitta noden i sin hashkorg" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Sökvägen är för lång" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriv över paketträff utan version för %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Filen %s/%s skriver över den i paketet %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Kunde inte ta status på %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Internt fel, kunde inta hitta delen %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Kunde inte tolka control-filen" @@ -2373,486 +2375,491 @@ msgstr "" "av användaren." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%lih %limin %lis" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%limin %lis" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Valet %s hittades inte" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Okänd typförkortning: \"%c\"" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Öppnar konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfel %s:%u: Block börjar utan namn." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfel %s:%u: Felformat märke" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad härifrån" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "Syntaxfel %s:%u: clear-direktivet kräver ett flaggträd som argument" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fel!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Färdig" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Färdig" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Förstår inte kommandoradsflaggan %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandoradsflaggan %s är inte boolsk" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Flaggan %s kräver ett argument." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Flaggan %s: Den angivna konfigurationsposten måste innehålla ett =<värde>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\"" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Flaggan \"%s\" är för lång" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Förstår inte %s, prova med \"true\" eller \"false\"." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Felaktig åtgärd %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status på monteringspunkten %s." -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status på cd-romen." -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem med att stänga gzip-filen %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Använder inte låsning för skrivskyddade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte öppna låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Använder inte låsning för nfs-monterade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhålla låset %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s tog emot signal %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem med att stänga gzip-filen %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Kunde inte öppna filhandtag %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Misslyckades med att skapa underprocess-IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Misslyckades med att starta komprimerare " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Problem med att stänga filen %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem med att avlänka filen %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "namnbyte misslyckades, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Ingen nyckelring installerad i %s." # Felmeddelande -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Paketcachen är tom" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Paketcachefilen är skadad" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Paketcachefilens version är inkompatibel" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Paketcachefilen är skadad" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denna APT saknar stöd för versionssystemet \"%s\"" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Paketcachen byggdes för en annan arkitektur" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Beroende av" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Förberoende av" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Föreslår" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Rekommenderar" # "Konfliktar"? -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Står i konflikt med" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Ersätter" # "Föråldrar"? -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Föråldrar" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Gör sönder" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Utökar" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "viktigt" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "nödvändigt" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Bygger beroendeträd" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Kandiderande versioner" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Beroendegenerering" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Läser tillståndsinformation" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Misslyckades med att öppna StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Misslyckades med att skriva temporär StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Rad %lu i källistan %s har fel format ([option] för kort)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2861,12 +2868,12 @@ msgstr "" "Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " "under APT::Immediate-Configure för information. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2878,19 +2885,19 @@ msgstr "" "Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " "aktivera flaggan \"APT::Force-LoopBreak\"." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexfiler av typ \"%s\" stöds inte" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2898,90 +2905,90 @@ msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " "tillbakahållna paket." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Kunde inte låsa katalogen %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Hämtar fil %li av %li (%s återstår)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Hämtar fil %li av %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Metoddrivrutinen %s kunde inte hittas." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck på Enter." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stöds inte" # -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte fastställa en lämplig paketsystemstyp" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Kunde inte ta status på %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du måste lägga till några \"source\"-URI:er i din sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -2989,127 +2996,122 @@ msgid "" msgstr "" # "Package" är en sträng i konfigurationsfilen -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Förstod inte nåltypen %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) för nål" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Cachen har ett inkompatibelt versionssystem" # NewPackage etc. är funktionsnamn #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Läser paketlistor" # Bättre ord? -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Samlar filtillhandahållningar" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "namnbyte misslyckades, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Storleken stämmer inte" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Felaktig åtgärd %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3120,12 +3122,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3134,78 +3136,78 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Inga sektioner i Release-filen %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Ingen Hash-post i Release-filen %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ogiltig \"Date\"-post i Release-filen %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Leverantörsblocket %s saknar fingeravtryck" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Använder cd-rom-monteringspunkten %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterar CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Väntar på skiva...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Identifierar... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Lagrad etikett: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterar CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Söker efter indexfiler på skivan...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3214,7 +3216,7 @@ msgstr "" "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3222,16 +3224,16 @@ msgstr "" "Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva " "eller felaktig arkitektur?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Hittade etiketten \"%s\"\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Namnet är ogiltigt, försök igen.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3240,34 +3242,34 @@ msgstr "" "Denna skiva heter: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Skriver ny källista\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i filer som inte stämmer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" @@ -3282,38 +3284,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunde inte hitta funktionen \"%s\"" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3322,57 +3324,57 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Kan inte välja installerad version från paketet %s eftersom det inte är " "installerat" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Kör dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3381,118 +3383,118 @@ msgstr "" "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " "använts istället." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Installerar %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Tar bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Uppmärksammar försvinnandet av %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Kör efterinstallationsutlösare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Katalogen \"%s\" saknas" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Förbereder %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Förbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Förbereder borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Förbereder borttagning av hela %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kunde inte skriva till %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "beroendeproblem - lämnar okonfigurerad" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3500,7 +3502,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " "ett efterföljande fel från ett tidigare problem." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3508,7 +3510,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3516,7 +3518,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " "är slut" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3525,14 +3527,14 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-" "fel för dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3540,21 +3542,21 @@ msgid "" msgstr "" "Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" "dpkg avbröts. Du måste köra \"%s\" manuellt för att korrigera problemet. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Inte låst" diff --git a/po/th.po b/po/th.po index 5c2c37fd8..b6415125a 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -18,153 +18,153 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "จำนวนชื่อแพกเกจทั้งหมด: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "จำนวนโครงสร้างแพกเกจทั้งหมด: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " แพกเกจปกติ: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " แพกเกจเสมือนแท้ๆ: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " แพกเกจเสมือนที่มีแพกเกจจริงเดียว: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " แพกเกจเสมือนผสม: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " แพกเกจที่ขาดหาย: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "จำนวนผังการตระเตรียมทั้งหมด: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "จำนวนสตริงทั้งหมด: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "พื้นที่สำรองทั้งหมด: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "พื้นที่ที่นับรวมทั้งหมด: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "ไม่พบแพกเกจ" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "คุณต้องระบุแพตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่งแพตเทิร์น" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "แฟ้มแพกเกจ:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "แพกเกจที่ถูกตรึง:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(ไม่พบ)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " ที่ติดตั้งอยู่: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " รุ่นที่ติดตั้งได้: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(ไม่มี)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " การตรึงแพกเกจ: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " ตารางรุ่น:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -234,28 +234,28 @@ msgstr "" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" "กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด" @@ -291,65 +291,65 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "จะเลือก '%s' เป็นแพกเกจซอร์สแทน '%s'\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "จะละเลยรุ่น '%s' ที่ไม่มีอยู่ของแพกเกจ '%s'" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" @@ -374,78 +374,78 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -453,17 +453,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -471,19 +471,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -492,37 +492,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -609,7 +609,7 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" @@ -618,7 +618,7 @@ msgstr "ต้องระบุแพกเกจอย่างน้อยห msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -631,53 +631,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s ไม่สามารถทำเครื่องหมายได้ เพราะไม่ได้ติดตั้งไว้\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบเลือกเองอยู่ก่อนแล้ว\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบอัตโนมัติอยู่ก่อนแล้ว\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s ถูกกำหนดให้คงรุ่นอยู่ก่อนแล้ว\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "กำหนด %s ให้คงรุ่นแล้ว\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "ยกเลิกการคงรุ่นของ %s แล้ว\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -722,7 +722,7 @@ msgstr "" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" "กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-mark(8) และ apt.conf(5)" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -769,172 +769,174 @@ msgstr "ไม่สามารถเลิกเมานท์ซีดีร msgid "Disk not found." msgstr "ไม่พบแผ่น" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "ไม่พบแฟ้ม" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI ไม่ถูกต้อง URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "เข้าระบบ" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "คำตอบท่วมบัฟเฟอร์" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "ไม่สามารถสร้างซ็อกเก็ต" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "ล้มเหลว" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "ไม่สามารถ bind ซ็อกเก็ต" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "ไม่สามารถส่งคำสั่ง PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "สอบถาม" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "ไม่สามารถเรียก " @@ -970,7 +972,7 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง %s #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "เชื่อมต่อไปยัง %s" @@ -1000,181 +1002,181 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "รอหัวข้อมูล" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "แปลกประหลาด... ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ต้องดาวน์โหลดแพกเกจ %sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1185,19 +1187,19 @@ msgstr "" "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "เลิกทำ" -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1205,19 +1207,19 @@ msgstr "" "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-" "missing อาจช่วยได้" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "จะล้มเลิกการติดตั้ง" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1228,15 +1230,15 @@ msgstr[0] "" "แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n" "โดยแพกเกจอื่นแล้ว:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1254,15 +1256,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1270,23 +1272,23 @@ msgid_plural "" "required:" msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1294,7 +1296,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1305,145 +1307,145 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " หรือ" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1451,27 +1453,27 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" @@ -1480,7 +1482,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1488,90 +1490,90 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " ล้มเหลว" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " เสร็จแล้ว" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "เสร็จแล้ว" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1583,43 +1585,43 @@ msgstr "" " อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n" " ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "เจอ " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "ดึง:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "ข้าม " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "ปัญหา " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [กำลังทำงาน]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1632,19 +1634,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "ไม่สามารถอ่าน %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s" @@ -1673,11 +1675,11 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" @@ -1715,7 +1717,7 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ msgid "Merging available information" msgstr "กำลังผสานรายชื่อของแพกเกจที่มี" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1739,40 +1741,40 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1849,217 +1851,217 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "ไม่มีรายการเลือกที่ตรง" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "stat %s ไม่สำเร็จ" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "แพกเกจไม่มีระเบียนควบคุม" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: stat %s ไม่สำเร็จ\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "หาพาธเต็มของ %s ไม่สำเร็จ" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "เดินท่องต้นไม้ไม่สำเร็จ" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "เปิด %s ไม่สำเร็จ" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "readlink %s ไม่สำเร็จ" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "unlink %s ไม่สำเร็จ" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s ไม่มีข้อมูล override\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - จองหน่วยความจำไม่สำเร็จ" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "ไม่สามารถเปิด %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "ไม่สามารถอ่านแฟ้ม override %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "สร้าง FILE* ไม่สำเร็จ" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "fork ไม่สำเร็จ" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "โพรเซสลูกสำหรับบีบอัด" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2112,157 +2114,157 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "สร้างไปป์ไม่สำเร็จ" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "เรียก gzip ไม่สำเร็จ" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "แฟ้มจัดเก็บเสียหาย" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "แฟ้มจัดเก็บสั้นเกินไป" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "จองเนื้อที่สำหรับ diversion ไม่สำเร็จ" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "ข้อผิดพลาดภายในที่ AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "พยายามเขียนทับ diversion: %s -> %s กับ %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "ไม่สามารถเขียนแฟ้ม %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "ไม่สามารถปิดแฟ้ม %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "พาธ %s ยาวเกินไป" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "ไดเรกทอรี %s ถูก divert" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของ diversion %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "พาธของ diversion ยาวเกินไป" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "หาโหนดใน bucket ของแฮชไม่พบ" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "พาธยาวเกินไป" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "ไม่สามารถ stat %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "ไม่สามารถแจงแฟ้มควบคุมได้" @@ -2319,481 +2321,486 @@ msgid "" msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%liวัน %liชม. %liนาที %liวิ" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%liชม. %liนาที %liวิ" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%liนาที %liวิ" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%liวิ" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "ไม่พบรายการเลือก %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ผิดพลาด!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... เสร็จแล้ว" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... เสร็จแล้ว" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "ไม่รู้จักตัวเลือกบรรทัดคำสั่ง '%c' [จาก %s]" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "ไม่เข้าใจตัวเลือกบรรทัดคำสั่ง %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =<val>" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "ตัวเลือก '%s' ยาวเกินไป" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "ไม่รู้จักคำสั่ง %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "ไม่สามารถ stat จุดเมานท์ %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "ไม่สามารถ stat ซีดีรอม" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "ไม่สามารถเปิด file destriptor %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "แคชของแพกเกจว่างเปล่า" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "แฟ้มแคชของแพกเกจเสียหาย" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "แฟ้มแคชของแพกเกจเสียหาย แฟ้มมีขนาดเล็กกว่าที่ควรจะเป็น" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "ต้องใช้" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "ต้องใช้ขณะติดตั้ง" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "แนะนำ" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "ควรใช้ร่วมกับ" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "ขัดแย้งกับ" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "แทนที่" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "ใช้แทน" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "ทำให้พัง" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "เพิ่มความสามารถ" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "สำคัญ" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "จำเป็น" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "มาตรฐาน" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "ตัวเลือก" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ส่วนเสริม" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "รุ่นแพกเกจที่มี" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "สร้างลำดับความสัมพันธ์" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "กำลังอ่านข้อมูลสถานะ" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "กำลังเปิด %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2802,12 +2809,12 @@ msgstr "" "ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ " "APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "ไม่สามารถตั้งค่า '%s'" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2819,18 +2826,18 @@ msgstr "" "ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย " "แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2838,185 +2845,180 @@ msgstr "" "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "ไม่สามารถล็อคไดเรกทอรี %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "ไม่สามารถเรียกทำงานวิธีการ %s" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "ไม่รองรับระบบแพกเกจ '%s'" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "ไม่สามารถ stat %s" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "ค่า '%s' ไม่สามารถใช้กับ APT::Default-Release ได้ เนื่องจากรุ่นดังกล่าวไม่มีในแหล่ง" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "ไม่เข้าใจชนิดการตรึง %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "กำลังอ่านรายชื่อแพกเกจ" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "ผลรวมแฮชไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "ไม่รู้จักคำสั่ง %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3025,16 +3027,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3043,12 +3045,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3058,90 +3060,90 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "ไม่สามารถแจงแฟ้ม Release %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "กำลังรอแผ่น...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "กำลังเมานท์ซีดีรอม...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "กำลังตรวจสอบชื่อแผ่น... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "ชื่อที่เก็บไว้: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3150,22 +3152,22 @@ msgstr "" "พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น " "%zu รายการ\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "ไม่พบแฟ้มแพกเกจใดๆ บางทีแผ่นนี้อาจจะไม่ใช่แผ่นเดเบียน หรือสถาปัตยกรรมอาจไม่ถูกต้อง" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "พบชื่อแผ่น '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "ไม่ใช่ชื่อที่ใช้ได้ กรุณาลองใหม่\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3174,34 +3176,34 @@ msgstr "" "แผ่นนี้เรียกชื่อว่า:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "กำลังคัดลอกรายชื่อแพกเกจ..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "เขียนแล้ว %i ระเบียน\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" @@ -3216,37 +3218,37 @@ msgstr "ไม่พบระเบียนยืนยันความแท msgid "Hash mismatch for: %s" msgstr "แฮชไม่ตรงกันสำหรับ: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "ไม่พบรุ่น '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "ไม่พบงานติดตั้ง '%s'" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3254,220 +3256,220 @@ msgid "" msgstr "" "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "เตรียมรับคำตอบ" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "เรียกกลไกการแก้ปัญหาภายนอก" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "กำลังเรียก dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "กำลังติดตั้ง %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "กำลังตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "กำลังถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "กำลังถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "กำลังจดบันทึกการหายไปของ %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "ไม่มีไดเรกทอรี '%s'" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "ไม่สามารถเปิดแฟ้ม '%s'" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "กำลังเตรียม %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "กำลังแตกแพกเกจ %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "กำลังเตรียมตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "ติดตั้ง %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "กำลังเตรียมถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "ถอดถอน %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "ไม่ได้ล็อคอยู่" diff --git a/po/tl.po b/po/tl.po index eedcc8ddd..dbd69f19f 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,157 +20,157 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Kabuuan ng mga Pakete : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Kabuuan ng mga Pakete : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normal na Pakete: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Purong Birtwual na Pakete: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Nag-iisang Birtwal na Pakete: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Halong Birtwal na Pakete: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Kulang/Nawawala: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Kabuuan ng Natatanging mga Bersyon: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "Kabuuan ng Natatanging mga Bersyon: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Kabuuan ng mga Dependensiya: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Kabuuan ng ugnayang Ber/Talaksan: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "Kabuuan ng ugnayang Ber/Talaksan: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Kabuuan ng Mapping ng Provides: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Kabuuan ng Globbed String: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Kabuuan ng Hindi Nagamit na puwang: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Kabuuan ng puwang na napag-tuosan: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Wala sa sync ang talaksan ng paketeng %s." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Walang nahanap na mga pakete" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "Kailangan niyong magbigay ng isa lamang na pattern" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Talaksang Pakete:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Mga naka-Pin na Pakete:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(hindi nahanap)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Nakaluklok: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Kandidato: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(wala)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Naka-Pin na Pakete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -246,29 +246,29 @@ msgstr "" "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n" "karagdagang impormasyon\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set." @@ -304,65 +304,65 @@ msgstr "" " -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" @@ -382,95 +382,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,7 +479,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -488,14 +488,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng " "%s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -504,7 +504,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -621,7 +621,7 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" @@ -630,7 +630,7 @@ msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -643,53 +643,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "ngunit ito ay hindi nakaluklok" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Bigo ang pagbukas ng %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -716,7 +716,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -764,52 +764,52 @@ msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." msgid "Disk not found." msgstr "Hindi nahanap ang Disk." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Pumapasok" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Hindi malaman ang pangalan ng peer" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Hindi malaman ang pangalang lokal" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Bigo ang PASS, sabi ng server ay: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -817,121 +817,123 @@ msgstr "" "May tinakdang katuwang na server ngunit walang login script, walang laman " "ang Acquire::ftp::ProxyLogin." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Bigo ang TYPE, sabi ng server ay: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Lumipas ang koneksyon" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Error sa pagbasa" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "May sagot na bumubo sa buffer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Error sa pagsulat" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Hindi maka-likha ng socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Bigo" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Hindi maka-konekta sa socket na passive." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "di makakuha ang getaddrinfo ng socket na nakikinig" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Hindi maka-bind ng socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Hindi makarinig sa socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Hindi malaman ang pangalan ng socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Hindi makapagpadala ng utos na PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Di kilalang pamilya ng address %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Bigo ang EPRT, sabi ng server ay: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Tanong" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Hindi ma-invoke " @@ -967,7 +969,7 @@ msgstr "Hindi maka-konekta sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Kumokonekta sa %s" @@ -997,40 +999,40 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Hindi maka-konekta sa %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1038,97 +1040,97 @@ msgstr "" "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " "available:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Naghihintay ng panimula" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Maling linyang panimula" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Internal na error" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nakapagtataka... Hindi magkatugma ang laki, mag-email sa apt@packages.debian." @@ -1136,21 +1138,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1158,31 +1160,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1193,19 +1195,19 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Abort." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Nais niyo bang magpatuloy?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1213,19 +1215,19 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1235,15 +1237,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1259,17 +1261,17 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1279,7 +1281,7 @@ msgid_plural "" msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1287,18 +1289,18 @@ msgid_plural "" msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1306,7 +1308,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1317,147 +1319,147 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Sirang mga pakete" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "" "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " o" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1465,27 +1467,27 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" @@ -1494,7 +1496,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[O/h]" @@ -1502,91 +1504,91 @@ msgstr "[O/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[o/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "H" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " ay bigo." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Tapos" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Tapos" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1594,43 +1596,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Tumama " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Kunin: " -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "DiPansin " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Nakakuha ng %sB ng %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [May ginagawa]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1643,19 +1645,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Di makalipat sa %s" @@ -1684,11 +1686,11 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" @@ -1731,7 +1733,7 @@ msgstr "" msgid "Merging available information" msgstr "Pinagsasama ang magagamit na impormasyon" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1755,40 +1757,40 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Error sa pagproseso ng directory %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1873,26 +1875,26 @@ msgstr "" " -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Walang mga pinili na tugma" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Luma ang DB, sinusubukang maupgrade ang %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1901,192 +1903,192 @@ msgstr "" "Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " "bersiyon ng apt, tanggalin at likhain muli ang database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Hindi mabuksan ang talaksang DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Bigo ang pag-stat ng %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Walang kontrol rekord ang arkibo" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Hindi mabasa ang directory %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Hindi ma-stat %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Mga error ay tumutukoy sa talaksang " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Bigo sa pag-resolba ng %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Bigo ang paglakad sa puno" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Bigo ang pagbukas ng %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Bigo ang pagbasa ng link %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Bigo ang pag-unlink ng %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Bigo ang pag-link ng %s sa %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Bigo ang pagreserba ng memory" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Hindi mabuksan %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Maling anyo ng override %s linya %lu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Bigo ang pagbasa ng talaksang override %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Maling anyo ng override %s linya %lu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Maling anyo ng override %s linya %lu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Maling anyo ng override %s linya %lu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Hindi kilalang algorithmong compression '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Kailangan ng compression set ang compressed output %s" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Bigo ang paglikha ng FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Bigo ang pag-fork" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Anak para sa pag-Compress" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Error na internal, bigo ang paglikha ng %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Bigo ang IO sa subprocess/talaksan" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2140,157 +2142,157 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Bigo sa paglikha ng mga pipe" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Bigo sa pagtakbo ng gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Sirang arkibo" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Bigo ang checksum ng tar, sira ang arkibo" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Hindi tanggap na signature ng arkibo" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Error sa pagbasa ng header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Hindi tanggap na header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Hindi tanggap na header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Bitin ang arkibo. Sobrang iksi." -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Bigo ang pagbasa ng header ng arkibo" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Tinawagan ang DropNode sa naka-link pa na node" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Bigo sa paghanap ng elemento ng hash!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Bigo ang pagreserba ng diversion" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internal error sa AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobleng pagdagdag ng diversion %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Nadobleng talaksang conf %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Sobrang haba ang path na %s" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Binubuklat ang %s ng labis sa isang beses" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Ang directory %s ay divertado" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Sobrang haba ng path na diversion" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ang directory %s ay papalitan ng hindi-directory" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Sobrang haba ng path" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Hindi ma-stat ang %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Internal error, hindi mahanap ang miyembrong %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Di maintindihang talaksang control" @@ -2348,502 +2350,507 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Maling anyo ng Tag" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: May basura matapos ng halaga" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Sinama mula dito" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Tapos" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Tapos" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Opsyon sa command line %s ay di naintindihan." -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Opsyon sa command line %s ay hindi boolean" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Opsyon %s ay nangangailangan ng argumento" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " "=<halaga>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Opsyon '%s' ay labis ang haba" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Hindi naintindihan ang %s, subukan ang true o false." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problema sa pagsara ng talaksan" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problema sa pagsara ng talaksan" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Hindi makapag-bukas ng pipe para sa %s" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Bigo ang paglikha ng subprocess IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Bigo ang pag-exec ng taga-compress" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Ina-abort ang pag-instol." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Walang laman ang cache ng pakete" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Sira ang talaksan ng cache ng pakete" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Sira ang talaksan ng cache ng pakete" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Dependensiya" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Mungkahi" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Rekomendado" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Tunggali" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Pumapalit" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Linalaos" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "kailangan" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Bersyong Kandidato" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 #, fuzzy msgid "Reading state information" msgstr "Pinagsasama ang magagamit na impormasyon" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Bigo ang pagbukas ng %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2855,12 +2862,12 @@ msgstr "" "loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-" "activate ang APT::Force-LoopBreak na option." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hindi suportado ang uri ng talaksang index na '%s'" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2868,7 +2875,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2876,222 +2883,217 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Nawawala ang directory ng arkibo %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Hindi maaldaba ang directory ng talaan" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Kinukuha ang talaksang %li ng %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Hindi ma-stat ang %s" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " "ito" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Hindi naintindihan ang uri ng pin %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Hindi akma ang versioning system ng cache" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Di tugmang laki" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3099,12 +3101,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3113,12 +3115,12 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3126,67 +3128,67 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Di tanggap na linya sa talaksang diversion: %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Block ng nagbebenta %s ay walang fingerprint" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Ina-unmount ang CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Kinikilala..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Ina-unmount ang CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3195,22 +3197,22 @@ msgstr "" "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " "signature\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Hindi yan tanggap na pangalan, subukan muli.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3219,34 +3221,34 @@ msgstr "" "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3263,88 +3265,88 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Di tugmang MD5Sum" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3353,167 +3355,167 @@ msgstr "" "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, fuzzy, c-format msgid "Installing %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Hindi makapagsulat sa %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Hindi maaldaba ang directory ng talaan" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" diff --git a/po/tr.po b/po/tr.po index ce3042910..22837bac3 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -20,155 +20,155 @@ msgstr "" "X-Generator: Poedit 1.5.5\n" "X-Launchpad-Export-Date: 2013-02-04 12:16+0000\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s paketinin (sürüm %s) karşılanamayan bir bağımlılığı var:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Toplam paketlerin adları: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Toplam paket yapıları: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Normal paketler: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Saf sanal paketler: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Tekil sanal paketler: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Karışık sanal paketler: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Eksik: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Toplam farklı sürümler: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Toplam farklı açıklamalar: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Toplam bağımlılıklar: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Toplam sürüm/dosya ilişkileri: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Toplam Tanım/Dosya ilişkileri: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Toplam destekleme eşleştirmeleri: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Toplam birikmiş dizgiler: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Toplam bağlımlık sürümü alanı: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Toplam serbest alan: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Hesaplanan toplam alan: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "%s paket dosyası eşzamansız." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Hiç paket bulunamadı" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "En az bir arama örüntüsü vermelisiniz" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "%s paketi bulunamadı" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Paket dosyaları:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Önbellek eşzamanlı değil, paket dosyası 'x-ref' yapılamıyor." #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Sabitlenmiş paketler:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(bulunamadı)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Kurulu: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Aday: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(hiçbiri)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Paket sabitleme: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Sürüm çizelgesi:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s (%s için) %s %s tarihinde derlendi\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -240,28 +240,28 @@ msgstr "" "Ayrıntılı bilgi için apt-cache(8) ve apt.conf(5) rehber sayfalarına göz " "atın.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Lütfen bu CD/DVD'ye bir isim verin, örneğin 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s', '%s' konumuna bağlanamadı" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Kalan CD'leriniz için bu işlemi yineleyin." @@ -298,47 +298,47 @@ msgstr "" " -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::" "cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "'%2$s' paketinin mevcut olmayan '%1$s' sürümünü görmezden gel" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "%s paketi bulunamadı" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s elle kurulmuş olarak ayarlı.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s otomatik olarak kurulmuş şekilde ayarlandı.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -346,19 +346,19 @@ msgstr "" "Bu komut artık kullanılmamaktadır. Bunun yerine 'apt-mark auto' ve 'apt-mark " "manual' kullanın." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "İç hata, sorun çözücü nesneyi bozdu" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "İndirme dizini kilitlenemiyor" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Kaynağının indirileceği en az bir paket seçilmeli" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "%s paketinin kaynak paketi bulunamadı" @@ -385,78 +385,78 @@ msgstr "" "bzr branch %s\n" "komutunu kullanın.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s içindeki boş alan miktarı belirlenemedi" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "%s üzerinde yeterli boş alan yok" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB kaynak arşivi indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB kaynak arşivi indirilecek.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "%s kaynağını al\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Bazı arşivler alınamadı." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor.\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Paket açma komutu '%s' başarısız.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "İnşa komutu '%s' başarısız oldu.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Alt süreç başarısız" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmedilir" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +465,17 @@ msgstr "" "%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) " "rehber sayfasındaki APT::Architectures kısmına göz atın." -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s paketinin hiç inşa bağımlılığı yok.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,7 +484,7 @@ msgstr "" "'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s " "bağımlılığı karşılanamıyor." -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -492,12 +492,12 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı." -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni." -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -506,7 +506,7 @@ msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü " "gerekli sürüm şartlarını karşılamıyor" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -514,30 +514,30 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s için inşa bağımlılıkları karşılanamadı." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "İnşa bağımlılıklarını işleme başarısız oldu" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) paketinin değişim günlüğü" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Desteklenen birimler:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -627,7 +627,7 @@ msgstr "" "sayfalarına bakabilirsiniz.\n" " Bu APT'nin Süper İnek Güçleri vardır.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Kaynağının indirileceği en az bir paket seçilmeli" @@ -636,7 +636,7 @@ msgstr "Kaynağının indirileceği en az bir paket seçilmeli" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -649,53 +649,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s kurulu olmadığı için işaretlenemedi.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s zaten elle kurulmuş olarak ayarlı.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s zaten otomatik kurulmuş olarak ayarlı.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s zaten tutulacak şekilde ayarlanmış.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s için beklenildi ama o gelmedi" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s paketi tutuluyor.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "%s paketini tutma işlemi iptal edildi.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -742,7 +742,7 @@ msgstr "" "Ayrıntılı bilgi için apt-mark(8) ve apt.conf(5) rehber sayfalarına\n" "bakabilirsiniz." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -790,52 +790,52 @@ msgstr "%s konumundaki CD-ROM çıkarılamıyor, hala kullanımda olabilir." msgid "Disk not found." msgstr "Disk bulunamadı." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Dosya bulunamadı" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Geçersiz URI, yerel URI'ler // ile başlamamalıdır" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Giriş yapılıyor" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Eş adı belirlenemiyor" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Yerel ad belirlenemiyor" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Sunucu bağlantıyı reddetti, sunucunun iletisi: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -843,121 +843,123 @@ msgstr "" "Bir Vekil sunucu belirtildi ancak oturum açma betiği belirtilmedi, Acquire::" "ftp::ProxyLogin boş." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Sunucu bağlantıyı kesti" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Okuma hatası" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Bir yanıt arabelleği taşırdı." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Yazma hatası" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Bir soket oluşturulamadı" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Başarısız" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Edilgen sokete bağlanılamadı." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo bir dinleme soketi alamıyor" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Bir sokete bağlanılamadı" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Soket dinlenemedi" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Soketin adı belirlenemedi" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "PORT komutu gönderilemedi" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Bilinmeyen adres ailesi %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Veri soketi bağlantısı zaman aşımına uğradı" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Bağlantı kabul edilemiyor" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Dosya sağlaması yapılamadı" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Veri soketi zaman aşımına uğradı" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Veri aktarımı başarısız, sunucunun iletisi: '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Sorgu" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Çağrılamıyor " @@ -993,7 +995,7 @@ msgstr "Adrese bağlanılamadı: %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Bağlanılıyor: %s" @@ -1023,132 +1025,132 @@ msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti" msgid "Unable to connect to %s:%s:" msgstr "Bağlanılamıyor %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "İç hata: İmza iyi, ancak anahtar parmak izi belirlenemedi?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "En az bir geçersiz imza ile karşılaşıldı." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "İmza doğrulama için 'gpgv' çalıştırılamadı (gpgv kurulu mu?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "gpgv çalıştırılırken bilinmeyen hata" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Aşağıdaki imzalar geçersiz:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Sunucundan okunurken hata" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Seçme başarısız" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Bağlantı zaman aşımına uğradı" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Çıktı dosyasına yazılırken hata" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Başlıklar bekleniyor" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Kötü başlık satırı" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP sunucusu geçersiz bir cevap başlığı gönderdi" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP sunucusu geçersiz bir Content-Length başlığı gönderdi" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP sunucusu geçersiz bir Content-Range başlığı gönderdi" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "HTTP sunucusunun aralık desteği bozuk" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Bilinmeyen tarih biçimi" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Kötü başlık verisi" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Bağlantı başarısız" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "İç hata" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "" "Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı " "bırakılmış." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "İç hata, Sıralama tamamlanamadı" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine " @@ -1156,53 +1158,53 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB arşiv dosyası indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB arşiv dosyası indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "%s içinde yeterli boş alanınız yok." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Yalnızca Önemsiz seçeneği ayarlandı, fakat bu önemsiz bir işlem bir değil." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Evet, söylediğim şekilde yap!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1213,19 +1215,19 @@ msgstr "" "Devam etmek için '%s' ifadesini yazınız\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Vazgeç." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Devam etmek istiyor musunuz?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Bazı dosyalar indirilemedi" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1233,19 +1235,19 @@ msgstr "" "Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing " "seçeneğini ekleyerek düzeltmeyi deneyin." -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Eksik paketler düzeltilemedi." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Kurulum iptal ediliyor." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1259,15 +1261,15 @@ msgstr[1] "" "Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n" "sisteminizden kayboldu:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1285,15 +1287,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "İç hata, AutoRemover bazı şeyleri bozdu" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1305,7 +1307,7 @@ msgstr[1] "" "Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek " "duyulmuyor:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1313,19 +1315,19 @@ msgid_plural "" msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n" msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın." msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Bunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız " "gerekebilir:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1333,7 +1335,7 @@ msgstr "" "Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği " "vermeden deneyin (ya da bir çözüm belirtin)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1345,145 +1347,145 @@ msgstr "" "bazı paketlerin henüz oluşturulamamış ya da oluşturulmakta\n" "olduğunu gösterir." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Bozuk paketler" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Aşağıdaki ek paketler de kurulacak:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Önerilen paketler:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Tavsiye edilen paketler:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Bazı paketlerin kimlik denetimi yapılamadı" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Paketler doğrulanmadan kurulsun mu?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "ama kurulu değil" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " ya da" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1491,27 +1493,27 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" @@ -1520,7 +1522,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[E/h]" @@ -1528,93 +1530,93 @@ msgstr "[E/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[e/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "H" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Bağımlılıklar düzeltiliyor..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " başarısız oldu." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Bağımlılıklar düzeltilemedi" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Yükseltme kümesi küçültülemiyor" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Tamamlandı" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız " "gerekebilir." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "'update' komutu bağımsız değişken almamaktadır" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Yükseltme hesaplanıyor... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "İç hata, AllUpgrade bazı şeyleri bozdu" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Bitti" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1626,43 +1628,43 @@ msgstr "" " Unutmayın ki simülasyonda kilitleme yapılmaz,\n" " bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin." -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "%s, %s olarak yeniden adlandırılamadı" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Bağlandı " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Alınıyor: " -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Yoksay " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Hata " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, 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:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Çalışıyor]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1675,19 +1677,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "%s okunamıyor" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "%s olarak değiştirilemedi" @@ -1716,11 +1718,11 @@ msgstr "Yansı dosyası %s okunamıyor" msgid "[Mirror: %s]" msgstr "[Yansı: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Altsürece IPC borusu oluşturulamadı" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Bağlantı vaktinden önce kapandı" @@ -1763,7 +1765,7 @@ msgstr "" msgid "Merging available information" msgstr "Kullanılabilir bilgiler birleştiriliyor" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1787,40 +1789,40 @@ msgstr "" " -c=? Belirtilen ayar dosyasını kullanır\n" " -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "%s dosyasına yazılamıyor" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf sürümü alınamıyor. debconf kurulu mu?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Paket uzantı listesi çok uzun" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "%s dizinini işlemede hata" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Kaynak uzantı listesi çok uzun" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "İçindekiler dosyasına üstbilgi yazmada hata" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "%s içeriğini işlemede hata" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1903,26 +1905,26 @@ msgstr "" " -c=? Belirtilen yapılandırma dosyası kullan\n" " -o=? Yapılandırma seçeneği ayarla" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Hiçbir seçim eşleşmedi" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1930,192 +1932,192 @@ msgstr "" "Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme " "yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Veritabanı dosyası %s açılamadı: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "%s durum bilgisi alınamadı" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Arşivin denetim kaydı yok" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "İmleç alınamıyor" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: %s dizini okunamıyor\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s durum bilgisi alınamıyor\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "E: Hatalar şu dosya için geçerli: " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "%s çözümlenemedi" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Ağaçta gezinme başarısız" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "%s açılamadı" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "%s bağlantı okuması başarılamadı" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "%s bağlantı koparma başarılamadı" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s, %s konumuna bağlanamadı" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " %sB'lik bağlantı koparma (DeLink) sınırına ulaşıldı.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Arşivde paket alanı yok" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s için geçersiz kılma girdisi yok\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s geliştiricisi %s, %s değil\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Bellek ayırma yapılamadı" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s açılamıyor" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Hatalı geçersiz kılma %s satır %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Geçersiz kılma dosyası %s okunamadı" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Hatalı geçersiz kılma %s satır %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Hatalı geçersiz kılma %s satır %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Hatalı geçersiz kılma %s satır %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Bilinmeyen sıkıştırma algoritması '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır." -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "DOSYA* oluşturulamadı" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "fork yapılamadı" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Çocuğu sıkıştır" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "İç hata, %s oluşturulamadı" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "MD5 hesaplanırken okunamadı" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "%s bağı koparılırken sorun çıktı" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "%s, %s olarak yeniden adlandırılamadı" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2169,157 +2171,157 @@ msgstr "" " -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Boru oluşturulamadı" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Gzip çalıştırılamadı " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Bozuk arşiv" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Bilinmeyen TAR başlığı türü %u, üye %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Geçersiz arşiv imzası" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Arşiv üyesi başlığı okuma hatası" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Geçerşiz arşiv üyesi başlığı %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Geçersiz arşiv üyesi başlığı" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Arşiv çok kısa" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Arşiv başlıkları okunamadı" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode hala bağlı olan düğüm üzerinde çağrıldı" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Sağlama elementi bulunamadı" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Yönlendirme tahsisi başarısız oldu" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion'da iç hata" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Bir yönlendirmenin üzerine yazılmaya çalışılıyor, %s -> %s ve %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "%s/%s yapılandırma dosyası zaten mevcut" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s dosyasına yazılamadı" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s dosyası kapatılamadı" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "%s yolu çok uzun" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s paketi bir çok kez açıldı" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "%s dizini yönlendirilmiş" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Yönlendirme yolu çok uzun" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Düğüm sağlama kovasında bulunamadı" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Yol çok uzun" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s paketinin sürümü yok" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "%s durum bilgisi alınamadı" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "İç hata, %s üyesi bulunamadı" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Ayrıştırılamayan 'control' dosyası" @@ -2379,211 +2381,206 @@ msgstr "" "artırılamadı." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li gün %li saat %li dk. %li sn." #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%li saat %li dk. %li sn." #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%li dk. %li sn." #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%li sn." -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "%s seçimi bulunamadı" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tanınamayan tür kısaltması: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Yapılandırma dosyası (%s) açılıyor" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Sözdizim hatası %s:%u: Blok ad olmadan başlıyor." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Sözdizim hatası %s:%u: Kötü biçimlendirilmiş etiket" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Sözdizim hatası %s:%u: Değerden sonra ilave gereksiz" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Sözdizim hatası %s:%u: Yönergeler yalnızca en üst düzeyde bitebilir" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Sözdizim hatası %s:%u: Çok fazla yuvalanmış 'include'" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Sözdizim hatası %s:%u: Buradan 'include' edilmiş" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Sözdizim hatası %s:%u: Desteklenmeyen yönerge '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Sözdizim hatası %s:%u: clear yönergesi argüman olarak bir seçenek ağacı " "gerektirir." -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sözdizim hatası %s:%u: Dosya sonunda ilave gereksiz" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Hata!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Bitti" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Bitti" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Komut satırı seçeneği '%c' [%s içinden] tanınmıyor." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Komut satırı seçeneği %s anlaşılamadı" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Komut satırı seçeneği %s mantıksal değer değil" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "%s seçeneği bir bağımsız değişkene gerek duyar." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "%s seçeneği: Yapılandırma öğesi tanımlaması =<değer> şeklinde değer " "içermelidir." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s seçeneği bir tam sayı bağımsız değişkene gerek duyar, '%s' değil" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "'%s' seçeneği çok uzun" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s algılaması anlaşılamadı, true (doğru) ya da false (yanlış) deneyin." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Geçersiz işlem: %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Cdrom durum bilgisi alınamadı" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gzip dosyası %s kapatılamadı" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Kilit dosyası %s açılamadı" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "%s kilidi alınamadı" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "'%s' dizin olmadığı için dosya listeli oluşturulamıyor" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor." -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor." -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2591,289 +2588,299 @@ msgstr "" "'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için " "yok sayılıyor." -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "%s altsüreci %u sinyali aldı" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s altsüreci bir hata kodu gönderdi (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gzip dosyası %s kapatılamadı" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "%s dosyası açılamadı" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Dosya tanımlayıcı %d açılamadı" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Altsüreç IPC'si oluşturulamadı" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Sıkıştırma programı çalıştırılamadı " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "%s dosyası kapatılamadı" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s dosyası %s olarak yeniden adlandırılamadı" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "%s dosyasından bağ kaldırma sorunu" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Dosya eşitlenirken sorun çıktı" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "yeniden adlandırma başarısız, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "%s dizininde kurulu bir anahtar yok." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Boş paket önbelleği" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Paket önbelleği dosyası bozulmuş" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Paket önbelleği dosyası uyumsuz bir sürümde" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Paket önbellek dosyası bozulmuş, çok küçük" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Bu APT '%s' sürümleme sistemini desteklemiyor." -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Paket önbelleği farklı bir mimarı için yapılmış" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Bağımlılıklar" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "ÖnBağımlılıklar" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Önerdikleri" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Tavsiye ettikleri" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Çakışmalar" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Değiştirilenler" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Eskiyenler" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Bozdukları" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Geliştirdikleri" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "önemli" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "gerekli" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "standart" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "seçimlik" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ilave" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Bağımlılık ağacı oluşturuluyor" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Aday sürümler" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Bağımlılık oluşturma" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Durum bilgisi okunuyor" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Durum dosyası (StateFile) %s açılamadı." -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Paket dosyası %s ayrıştırılamadı (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Paket dosyası %s ayrıştırılamadı (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] " "ayrıştırılamıyor)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama " "değil)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin " "anahtarı yok)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s " "anahtarına değer atanmamış)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "%s Açılıyor" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2882,12 +2889,12 @@ msgstr "" "\"%s\" paketinin anında yapılandırması başarısız oldu. Ayrıntılar için apt." "conf(5) rehber sayfasının APT::Immediate-Configure kısmına bakın. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' paketi yapılandırılamadı. " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2899,12 +2906,12 @@ msgstr "" "kötü bir durumdur, ama ille de devam etmek isterseniz, APT::Force-LoopBreak " "seçeneğini etkinleştirin." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "İndeks dosyası türü '%s' desteklenmiyor" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2912,7 +2919,7 @@ msgstr "" "%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası " "bulunamıyor." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2920,91 +2927,91 @@ msgstr "" "Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun " "nedeni tutulan paketler olabilir." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Liste dizini %spartial bulunamadı." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Arşiv dizini %spartial bulunamadı." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "%s dizini kilitlenemiyor" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Alınan dosya: %li / %li (%s kaldı)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Alınan dosya: %li / %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, 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 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "%s yöntemi düzgün şekilde başlamadı" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş " "(enter) tuşuna basın." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketleme sistemi '%s' desteklenmiyor" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Uygun bir paketleme sistemi türü bulunamıyor" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "%s için dosya bilgisi alınamadı." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız." -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Paket listeleri ya da durum dosyası ayrıştırılamadı ya da açılamadı." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz." -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Kaynak listesi okunamadı." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3013,97 +3020,92 @@ msgstr "" "APT::Default-Release için '%s' değeri geçersizdir, çünkü kaynaklarda böyle " "bir sürüm yok." -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "%s tercihler dosyasında geçersiz kayıt, Paket başlığı yok" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "İğne türü %s anlaşılamadı" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "İğne için öncelik belirlenmedi (ya da sıfır)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Paket listeleri okunuyor" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Dosya Sağlananları Toplanıyor" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "yeniden adlandırma başarısız, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Sağlama toplamları eşleşmiyor" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Boyutlar eşleşmiyor" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Geçersiz işlem: %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3112,17 +3114,17 @@ msgstr "" "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " "dosyasındaki girdi ya da satır hatalı)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3131,12 +3133,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3146,12 +3148,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3160,78 +3162,78 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "'Release' dosyası (%s) ayrıştırılamadı" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "'Release' dosyası %s içinde hiç bölüm yok" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "'Release' dosyasında (%s) sağlama girdisi yok" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Sağlayıcı bloğu %s parmak izi içermiyor" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM bağlama noktası %s kullanılıyor\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM ayrılıyor...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Disk bekleniliyor...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM bağlanıyor...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Tanımlanıyor... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Kayıtlı etiket: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM ayrılıyor...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Disk, indeks dosyaları için taranıyor...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3240,7 +3242,7 @@ msgstr "" "%zu paket indeksi, %zu kaynak indeksi, %zu çeviri indeksi ve %zu imza " "bulundu\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3248,16 +3250,16 @@ msgstr "" "Hiç paket dosyası bulunamadı. Belirttiğiniz disk bir Debian diski değil ya " "da yanlış mimariye sahip." -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "'%s' etiketi bulundu\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Bu, geçerli bir ad değil, yeniden deneyin.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3266,34 +3268,34 @@ msgstr "" "Disk adı: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Paket listeleri kopyalanıyor.." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Yeni kaynak listesi yazılıyor\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Bu disk için olan kaynak listesi girdileri:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "%i kayıt yazıldı.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" @@ -3308,37 +3310,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:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' görevi bulunamadı" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, 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 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3347,51 +3349,51 @@ msgstr "" "'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de " "seçilemiyor" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, 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" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Çözücüye senaryo gönder" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Çözücüye istek gönder" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Çözüm almak için hazırlan" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Harici çözücüyü çalıştır" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "dpkg çalıştırılıyor" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3399,119 +3401,119 @@ msgstr "" "Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki " "sürümleri kullanıldı." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "%s kuruluyor" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "%s yapılandırılıyor" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "%s tamamen kaldırılıyor" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "%s paketinin kaybolduğu not ediliyor" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "'%s' dizini bulunamadı" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "'%s' dosyası açılamadı" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "%s hazırlanıyor" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "%s paketi açılıyor" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "%s paketini yapılandırmaya hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "%s kuruldu" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "%s paketinin kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "%s kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "%s tamamen kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s dosyasına yazılamıyor" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "İşlem yarıda kesildi" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3519,14 +3521,14 @@ msgstr "" "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " "kaynaklanan bir hata olduğunu belirtiyor." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3534,7 +3536,7 @@ msgstr "" "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport " "raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3542,14 +3544,14 @@ msgid "" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Hata iletisi bir dpkg G/Ç hatasına işaret ettiği için apport raporu " "yazılamadı" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3558,21 +3560,21 @@ msgstr "" "Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor " "olmasın?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Yönetim dizini (%s) kilitlenemiyor, root kullanıcısı mısınız?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" "dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Kilitlenmemiş" diff --git a/po/uk.po b/po/uk.po index 770f83d3b..0d9c44873 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -24,156 +24,156 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакунок %s версії %s має незадоволену залежність:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Всього імен пакунків: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Всього структур пакунків: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Нормальних пакунків: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Цілком віртуальних пакунків: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Окремих віртуальних пакунків: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Змішаних віртуальних пакунків: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Відсутні: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Всього унікальних версій: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Всього унікальних описів: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Всього залежностей: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Всього відносин Версія/Файл: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Всього відносин Опис/Файл: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 #, fuzzy msgid "Total Provides mappings: " msgstr "Всього карт 'Provides': " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Всього відфільтрованих (globbed) рядків: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 #, fuzzy msgid "Total dependency version space: " msgstr "Всього інформації про залежності: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 #, fuzzy msgid "Total slack space: " msgstr "Порожнього місця в кеші: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Загальний простір полічений для: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Перелік пакунків %s розсинхронізований." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Не знайдено жодного пакунка" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Ви повинні задати не менше одного шаблону пошуку" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Переліки пакунків:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Зафіксовані пакунки:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(не знайдено)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Встановлено: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(відсутній)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Фіксатор(pin) пакунка: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Таблиця версій:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпільовано %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -243,28 +243,28 @@ msgstr "" " -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n" "Дивіться подробиці на man-сторінках apt-cache(8) і apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Задайте назву для цього Диска, наприклад 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Будь-ласка, вставте Диск у пристрій і натисніть Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не вдалося під'єднати '%s' до '%s'" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторіть цей процес для решти CD з вашого набору." @@ -300,47 +300,47 @@ msgstr "" " -с=? Читати зазначений конфігураційний файл.\n" " -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Обираю '%s' як пакунок вихідних текстів, замість '%s'\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s позначений як встановлений вручну.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s позначений як автоматично встановлений.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -348,21 +348,21 @@ msgstr "" "Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' " "і 'apt-mark manual'." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем щось поламав" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати директорію для завантаження" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" @@ -387,81 +387,81 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -470,17 +470,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +489,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +497,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +513,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +522,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -637,7 +637,7 @@ msgstr "" "містять більше інформації і опцій.\n" " Цей APT має Супер-Коров'ячу Силу.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "" @@ -648,7 +648,7 @@ msgstr "" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -661,53 +661,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s не може бути позначений, тому що він не встановлений.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s вже був позначений, як встановлений вручну.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s вже був позначений, як автоматично встановлений.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s вже був зафіксований.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s вже був незафіксований.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікував на %s, але його там не було" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s зафіксовано.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Фіксацію для %s відмінено.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "Не вдалося виконати dpkg. Ви root?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 #, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" @@ -754,7 +754,7 @@ msgstr "" " -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n" "Для докладної інформації дивіться керівництва для apt-mark(8) і apt.conf(5)." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -803,53 +803,53 @@ msgstr "" msgid "Disk not found." msgstr "Диск не знайдено." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Файл не знайдено" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Невірне посилання (URI), локальні посилання не повинні починатися з //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Логінюсь в" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Неможливо визначити назву вузла" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Неможливо визначити локальну назву" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сервер розірвав з'єднання, відповівши: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER невдало, сервер мовив: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS невдало, сервер мовив: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -857,121 +857,123 @@ msgstr "" "Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin " "пустий." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Команда '%s' у скрипті логіна не вдалася, сервер мовив: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE невдало, сервер мовив: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Час з'єднання вичерпався" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Помилка зчитування" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Відповідь переповнила буфер." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Помилка запису" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Неможливо створити сокет (socket)" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Невдача" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Неможливо під'єднати пасивний сокет (passive socket)." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "Виклик getaddrinfo не зміг отримати слухаючий сокет" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Неможливо приєднатися до сокета" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Неможливо прослухати на сокеті" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Не вдалося визначити назву сокета" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Неможливо відіслати команду PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Невідоме адресове сімейство %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT невдало, сервер мовив: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Час з'єднання з сокетом даних вичерпався" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Проблема хешування файла" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неможливо завантажити файл, сервер мовив: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Час з'єднання з сокетом (socket) з даними вичерпався" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача даних обірвалася, сервер мовив '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Черга" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Неможливо викликати " @@ -1007,7 +1009,7 @@ msgstr "Неможливо під'єднатися до %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "З'єднання з %s" @@ -1037,38 +1039,38 @@ msgstr "Сталося щось дивне при спробі отримати msgid "Unable to connect to %s:%s:" msgstr "Неможливо під'єднатися до %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Наступні підписи були невірними:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1076,117 +1078,117 @@ msgstr "" "Наступні підписи не можуть бути перевірені, тому що публічний ключ " "відсутній:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Пусті файли не можуть бути правильними архівами" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Помилка запису у файл" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Помилка зчитування з сервера" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Помилка запису у файл" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Вибір провалився" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Помилка запису у вихідний файл" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Очікування на заголовки" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Невірний рядок заголовку" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сервер відіслав невірний заголовок 'reply'" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сервер відіслав невірний заголовок 'Content-Range'" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Цей HTTP сервер має поламану підтримку 'range'" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Внутрішня помилка" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутрішня помилка, InstallPackages була викликана з непрацездатними " "пакунками!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Необхідно видалити пакунки, але видалення заборонене." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Внутрішня помилка, Ordering не завершилася" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "Дивно... Розбіжність розмірів, напишіть на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необхідно завантажити %sB/%sB архівів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необхідно завантажити %sB архівів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -1194,33 +1196,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостатньо вільного місця в %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Виявлено проблеми, а опція -y була використана без --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Вказано виконання тільки тривіальних операцій, але це не тривіальна операція." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Так, робити, як я скажу!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1231,19 +1233,19 @@ msgstr "" "Щоб продовжити, введіть фразу: '%s'\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Перервано." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Бажаєте продовжити?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1251,19 +1253,19 @@ msgstr "" "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " "або спробувати повторити запуск з ключем --fix-missing?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing і зміна носія в даний момент не підтримується" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Неможливо виправити втрачені пакунки." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Переривається встановлення." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1280,15 +1282,15 @@ msgstr[2] "" "Вказані пакунки зникли з вашої системи, так як\n" "усі файли були перезаписані іншими пакунками:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Увага: це зроблено автоматично і умисно dpkg'ем." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1306,15 +1308,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутрішня Помилка, AutoRemover щось поламав" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1325,7 +1327,7 @@ msgstr[0] "" msgstr[1] "Наступні пакунки були встановлені автоматично і більше не потрібні:" msgstr[2] "Наступні пакунки були встановлені автоматично і більше не потрібні:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1336,20 +1338,20 @@ msgstr[1] "" msgstr[2] "" "%lu пакунків було встановлено автоматично і вони більше не потрібні.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його." msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх." msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1357,7 +1359,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи назв пакунків (або вкажіть рішення)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1368,145 +1370,145 @@ msgstr "" "або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Зламані пакунки" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Автентифікаційне попередження не прийнято до уваги.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Деякі пакунки неможливо автентифікувати" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Встановити ці пакунки без перевірки?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "але він не встановлений" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " чи" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1514,27 +1516,27 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" @@ -1543,7 +1545,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1551,93 +1553,93 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Виправлення залежностей..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " невдача." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Неможливо скоригувати залежності" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Неможливо мінімізувати набір оновлень" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Виконано" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Для виправлення цих помилок ви можете скористатися 'apt-get -f install'." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Незадоволені залежності. Спробуйте використати -f." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade щось поламав" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Виконано" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1649,43 +1651,43 @@ msgstr "" " Також не забувайте, що блокування вимикається,\n" " тому не очікуйте на відповідність поточній реальній ситуації!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Не вдалося перейменувати %s на %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "В кеші " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Отр:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Ігн " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Пом " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Отримано %sB за %sB (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Йде робота]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1698,19 +1700,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Неможливо прочитати %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Неможливо змінити на %s" @@ -1739,11 +1741,11 @@ msgstr "Неможливо прочитати файл дзеркала '%s'" msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC канал для підпроцесу" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "З'єднання завершено передчасно" @@ -1786,7 +1788,7 @@ msgstr "" msgid "Merging available information" msgstr "Об'єднання доступної інформації" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1810,42 +1812,42 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Неможливо визначити версію debconf. Він встановлений?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Список розширень, припустимих для пакунків, занадто довгий" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Помилка обробки директорії %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "" "Список розширень, припустимих для пакунків з вихідними текстами, занадто " "довгий" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1933,26 +1935,26 @@ msgstr "" " -c=? Використати зазначений конфігураційний файл\n" " -o=? Вказати довільний параметр конфігурації" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Збігів не виявлено" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "У групі пакунків '%s' відсутні деякі файли" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД була пошкоджена, файл перейменований на %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД застаріла, намагаюсь оновити %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1960,192 +1962,192 @@ msgstr "" "Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка " "видаліть і наново створіть базу-даних." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не вдалося відкрити файл БД %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Не вдалося одержати атрибути %s" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "В архіві немає запису 'control'" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Неможливо одержати курсор" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "У: Не вдалося прочитати директорію %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "У: Неможливо прочитати атрибути %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "П: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "У: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "П: Помилки відносяться до файлу " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Не вдалося визначити %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Не вдалося зробити обхід дерева" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Не вдалося відкрити %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Не вдалося прочитати посилання (readlink) %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Не вдалося видалити посилання (unlink) %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не вдалося створити посилання %s на %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Перевищено ліміт в %sB в DeLink.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Архів не мав поля 'package'" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, fuzzy, c-format msgid " %s has no override entry\n" msgstr " Відсутній запис про перепризначення (override) для %s\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакунок %s супроводжується %s, а не %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - Не вдалося виділити пам'ять" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Не вдалося відкрити %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Не вдалося прочитати файл перепризначень (override) %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Невідомий алгоритм стиснення '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Не вдалося створити FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Не вдалося породити процес (fork)" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Процес-нащадок, що виконує пакування" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутрішня помилка, не вдалося створити %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Помилка уведення/виводу в підпроцес/файл" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Помилка зчитування під час обчислення MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Не вдалося перейменувати %s на %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2200,161 +2202,161 @@ msgstr "" " -c=? читати зазначений файл конфігурації\n" " -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Не вдалося створити канали (pipes)" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Не вдалося виконати gzip " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Пошкоджений архів" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Контрольна сума tar архіва невірна, архів пошкоджений" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Невідомий тип заголовку TAR - %u, член %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Невірний підпис архіву" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Неможливо прочитати заголовок 'member' в архіві" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "Невірний заголовок 'member' %s в архіві" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 #, fuzzy msgid "Invalid archive member header" msgstr "Невірний заголовок 'member' в архіві" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Архів занадто малий" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Не вдалося прочитати заголовки в архіві" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode було викликано для вузла, що ще використовувався" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Не вдалося знайти елемент хеша!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 #, fuzzy msgid "Failed to allocate diversion" msgstr "Не вдалося створити diversion" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Внутрішня помилка в AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, fuzzy, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Спроба перезапису diversion, %s -> %s і %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, fuzzy, c-format msgid "Double add of diversion %s -> %s" msgstr "Подвійне додавання diversion %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Копія конфігураційного файлу %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Не вдалося записати файл %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Не вдалося закрити файл %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Шлях %s занадто довгий" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Розпакування %s більш ніж один раз" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, fuzzy, c-format msgid "The directory %s is diverted" msgstr "Директорія %s є відхиленою (diverted)" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакунок пробує записати у ціль з diversion %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 #, fuzzy msgid "The diversion path is too long" msgstr "Шлях 'diversion' є занадто довгим" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Директорія %s замінюється не директорією" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 #, fuzzy msgid "Failed to locate node in its hash bucket" msgstr "Не вдалося знайти вузол у його наборі хешів" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Шлях занадто довгий" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Перезаписати відповідність пакунка без версії для %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s перезаписує інший файл в пакунку %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Неможливо прочитати атрибути %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Невірний DEB архів, відсутній член '%s'" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Внутрішня помилка, не можу знайти складову частину %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Контрольний файл не можливо обробити" @@ -2414,493 +2416,498 @@ msgstr "" "користувачем." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%liд %liг %liхв %liс" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%liг %liхв %liс" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%liхв %liс" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%liс" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Вибір %s не знайдено" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Нерозпізнаваний тип абревіатури: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Відкривається конфігураційний файл %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксична помилка %s:%u: Блок починається без назви." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксична помилка %s:%u: спотворений тег" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксична помилка %s:%u: зайві символи після величини" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксична помилка %s:%u: Директиви можуть бути виконані тільки на " "найвищому рівні" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксична помилка %s:%u: Забагато вмонтованих (nested) включень" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксична помилка %s:%u: Включено звідси" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксична помилка %s:%u: Директива '%s' не підтримується" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Синтаксична помилка %s:%u: 'clear directive' потребує дерево налаштувань як " "аргумент" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксична помилка %s:%u: Зайве сміття в кінці файла" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Помилка!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Виконано" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... Виконано" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Невідомий параметр командного рядка '%c' [з %s]." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Незрозумілий параметр %s командного рядка" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Параметр %s командного рядка не є логічного типу 'boolean'" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Параметр %s потребує аргумента." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Опція %s: Специфікація вимагає, щоб рядки у конфігурації мали вираз =<val>." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Параметр %s потребує цілочислений аргумент, але не '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Параметр '%s' є занадто довгим" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Незрозумілий вираз %s, спробуйте true чи false." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Невірна дія %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Неможливо прочитати атрибути точки монтування %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Не вдалося прочитати атрибути cdrom" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Проблема з закриттям gzip файла %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s доступний тільки " "для зчитування" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Неможливо відкрити 'lock' файл %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s знаходиться на " "файловій системі nfs" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Неможливо отримати замок %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Підпроцес %s отримав сигнал %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Проблема з закриттям gzip файла %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Неможливо відкрити файл %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Неможливо відкрити файловий дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Не вдалося створити IPC з породженим процесом" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Не вдалося виконати компресор " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Проблема з закриттям файла %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема з роз'єднанням файла %s" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "не вдалося перейменувати, %s (%s -> %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Не встановлено 'keyring' у %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Кеш пакунків пустий" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Файл кешу пакунків пошкоджений" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Файл кешу пакунків має несумісну версію" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Файл кешу пакунків пошкоджений, занадто малий" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Цей APT не підтримує систему призначення версій '%s'" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Кеш пакунків був побудований для іншої архітектури" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Залежності (Depends)" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Пре-Залежності (PreDepends)" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Пропонує (Suggests)" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Рекомендує (Recommends)" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Конфлікти (Conflicts)" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Заміняє (Replaces)" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Застарілі (Obsoletes)" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Ламає (Breaks)" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Покращує (Enhances)" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "важливі (important)" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "необхідні (required)" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "стандартні (standard)" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "необов'язкові (optional)" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "додаткові (extra)" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Побудова дерева залежностей" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Версії кандидатів" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Ґенерація залежностей" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Зчитування інформації про стан" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Не вдалося відкрити StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Не вдалося записати до тимчасового StateFile файла %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Неможливо проаналізувати файл пакунку %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неможливо проаналізувати файл пакунку %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Рядок %u є занадто довгим у переліку джерел %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворений рядок %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2909,12 +2916,12 @@ msgstr "" "Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 " "apt.conf, нижче APT::Immediate-Configure для деталей. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Неможливо налаштувати '%s'." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2926,19 +2933,19 @@ msgstr "" "погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Тип '%s' індексного файлу не підтримується" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2946,89 +2953,89 @@ msgstr "" "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " "пов'язано з зафіксованими пакунками." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Відсутня директорія зі списками: %spartial" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Відсутня директорія для архівів: %spartial" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Неможливо заблокувати директорію %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Завантажується файл %li з %li (залишилось %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Завантажується файл %li з %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не знайдено." -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s стартував некоректно" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Система пакування '%s' не підтримується" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Неможливо визначити тип необхідної системи пакування" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Неможливо прочитати атрибути %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "Для виправлення цих помилок Ви можете виконати apt-get update" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Неможливо прочитати перелік вихідних кодів." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3037,98 +3044,93 @@ msgstr "" "Невірне значення '%s' для APT::Default-Release, так як такий випуск не є " "доступним у вихідних кодах" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Невірний запис у файлі налаштувань %s, відсутній заголовок Package" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Не зрозумів тип %s для фіксатора пакунків (pin)" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Кеш має несумісну систему призначення версій" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Виникла помилка під час обробки %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Ого! Ви перевищили кількість версій, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Ого! Ви перевищили кількість описів, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакунок %s %s не був знайдений під час обробки залежностей" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Зчитування переліків пакунків" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 #, fuzzy msgid "Collecting File Provides" msgstr "Збирання інформації про 'File Provides'" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження кешу вихідних текстів" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "не вдалося перейменувати, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Невідповідність хешу MD5Sum" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Невідповідність розміру" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Невірна дія %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3137,16 +3139,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3155,12 +3157,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3170,12 +3172,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3184,79 +3186,79 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Неможливо проаналізувати 'Release' файл %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Немає секцій у 'Release' файлі %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Немає запису 'Hash' у 'Release' файлі %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Невірний запис 'Date' у 'Release' файлі %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Блок постачальника %s не містить відбитку (fingerprint)" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Використовується точка монтування CD-ROM: %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтується CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Чекаю на диск...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Монтується CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Ідентифікація... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Записано мітку: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Демонтується CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Сканується диск на вміст індексних файлів...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3265,7 +3267,7 @@ msgstr "" "Знайдено %zu індексів пакунків, %zu індексів вихідних текстів, %zu індексів " "перекладів і %zu підписів\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3273,16 +3275,16 @@ msgstr "" "Неможливо знайти ніякі файли пакунків, можливо, що це не диск з Debian, або " "невірна архітектура?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Знайдено мітку: '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Не є вірною назвою, спробуйте ще.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3291,34 +3293,34 @@ msgstr "" "Цей диск зветься: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Копіюються переліки пакунків..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Записується новий перелік вихідних текстів\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Перелік вихідних текстів для цього диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Записано %i записів.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записано %i записів з %i відсутніми файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записано %i записів з %i невідповідними файлам\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" @@ -3333,37 +3335,37 @@ msgstr "Неможливо знайти аутентифікаційний за msgid "Hash mismatch for: %s" msgstr "Невідповідність хешу для: %s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Випуск '%s' для '%s' не знайдено" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версія '%s' для '%s' не знайдена" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Неможливо знайти завдання '%s'" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3372,61 +3374,61 @@ msgstr "" "Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', " "так як вони відсутні" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто " "віртуальним" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не " "встановлено" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 #, fuzzy msgid "Send scenario to solver" msgstr "Відправити сценарій розв'язувачу" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 #, fuzzy msgid "Send request to solver" msgstr "Відправити запит розв'язувачу" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 #, fuzzy msgid "Prepare for receiving solution" msgstr "Пригодуватися до отримання розв'язку" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" "Зовнішній розв'язувач завершився невдало без відповідного повідомлення про " "помилку" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 #, fuzzy msgid "Execute external solver" msgstr "Виконати зовнішній розв'язувач" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Виконується dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3434,120 +3436,120 @@ msgstr "" "Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або " "замість них були використані старіші версії." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Встановлюється %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Налаштовується %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Видаляється %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Повністю видаляється %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Взято до відома зникнення %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Виконується післяустановочний ініціатор %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Директорія '%s' відсутня" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Неможливо відкрити файл '%s'" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Підготовка %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Розпакування %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Підготовка до конфігурації %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Встановлено %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Підготовка до видалення %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Видалено %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Підготовка до повного видалення %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Повністю видалено %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неможливо записати в %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Операцію було перервано до того, як вона мала завершитися" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Звіт apport не був записаний, тому що параметр MaxReports вже досягнув " "максимальної величини" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "проблеми з залежностями - залишено неналаштованим" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3555,7 +3557,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " "що ця помилка є наслідком попередньої невдачі." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3563,7 +3565,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3571,7 +3573,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця у пам'яті" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3580,14 +3582,14 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "помилку В/В (I/O) у dpkg" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3596,14 +3598,14 @@ msgstr "" "Неможливо заблокувати адміністративну директорію (%s), може її використовує " "інший процес?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3611,7 +3613,7 @@ msgstr "" "dpkg було перервано, ви повинні вручну запустити '%s' аби виправити " "проблему. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Не заблоковано" diff --git a/po/vi.po b/po/vi.po index d4d94e994..42fe3efe6 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.15.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+0100\n" "PO-Revision-Date: 2014-03-03 15:40+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -22,155 +22,155 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Gói %s phiên bản %s có phần phụ thuộc chưa thỏa mãn:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Tổng các tên gói: " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Tổng các cấu trúc gói: " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Gói thường: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Gói thuần ảo: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Gói ảo đơn: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Gói ảo hỗn hợp: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Thiếu: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Tổng phiên bản riêng: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Tổng mô tả riêng: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Tổng gói phụ thuộc: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Tổng liên quan phiên bản và tập tin: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Tổng quan hệ mô-tả/tập-tin: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Tổng ánh xạ Cung cấp: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Tổng chỗ phiên bản phụ thuộc: " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Tổng chỗ trống: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Tổng chỗ đã tính dành cho: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Tập tin gói %s không đồng bộ được." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Không tìm thấy gói" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "Bạn phải đưa ra ít nhất một mẫu tìm kiếm" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 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:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "Không thể định vị gói %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "Tập tin gói:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "Các gói đã ghim:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(không tìm thấy)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " Đã cài đặt: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " Ứng cử: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(không)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " Ghim gói: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " Bảng phiên bản:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s-%s được biên dịch cho %s vào lúc “%s %s”\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -244,32 +244,33 @@ msgstr "" "Để tìm thông tin thêm, xem hai trang hướng dẫn\n" " apt-cache(8) và apt.conf(5).\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" -"Không tìm thấy CD-ROM bằng cách dò tìm hay sử dụng điểm gắn mặc định.\n" -"Bạn có lẽ nên dùng tùy chọn --cdrom để đặt điểm gắn CD-ROM.\n" -"Xem “man apt-cdrom” để có thêm thông tin về tự động dò tìm và điểm gắn CD-" -"ROM." - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Hãy cung cấp tên cho Đĩa này, kiểu như là: “Debian 5.0.3 Đĩa 1”" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Gặp lỗi khi gắn “%s” vào “%s”" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +#, fuzzy +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" +"Không tìm thấy CD-ROM bằng cách dò tìm hay sử dụng điểm gắn mặc định.\n" +"Bạn có lẽ nên dùng tùy chọn --cdrom để đặt điểm gắn CD-ROM.\n" +"Xem “man apt-cdrom” để có thêm thông tin về tự động dò tìm và điểm gắn CD-" +"ROM." + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn." @@ -307,47 +308,47 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, ví dụ -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, c-format msgid "Can not find a package for architecture '%s'" msgstr "Không tìm thấy gói cho kiến trúc “%s”" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Không tìm thấy gói “%s” với phiên bản “%s”" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Không tìm thấy gói “%s” với số phát hành “%s”" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Đang chọn “%s” làm gói nguồn, thay thế cho “%s”\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Không tìm thấy phiên bản “%s” của gói “%s”" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành “được cài đặt bằng tay”.\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s được đặt thành “được tự động cài đặt”.\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -355,19 +356,19 @@ msgstr "" "Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark auto” và “apt-mark manual” " "để thay thế." -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Không thể khoá thư mục tải về" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" @@ -393,79 +394,79 @@ msgstr "" "bzr branch %s\n" "để lấy các gói mới nhất (có thể là chưa phát hành).\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ chỗ trống trên %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB từ kho nguồn.\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "Lấy mã nguồn %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "Gặp lỗi khi lấy một số kho." -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh biên dịch “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -474,17 +475,17 @@ msgstr "" "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::" "Architectures để cài đặt" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi biên dịch.\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -493,7 +494,7 @@ msgstr "" "Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên " "gói “%s”" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -501,14 +502,14 @@ msgid "" msgstr "" "Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là " "quá mới" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -517,7 +518,7 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s " "có thể thỏa mãn điều kiện phiên bản" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -526,30 +527,30 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản " "ứng cử" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s." -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Hỗ trợ các mô-đun:" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -643,7 +644,7 @@ msgstr "" " apt-get(8), sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 msgid "Must specify at least one pair url/filename" msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin" @@ -651,7 +652,7 @@ msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin" msgid "Download Failed" msgstr "Gặp lỗi khi tải về" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -673,55 +674,55 @@ msgstr "" "\n" " Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep”.\n" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "không thể đánh dấu %s như là nó chưa được cài đặt.\n" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s được đặt thành được cài đặt bằng tay.\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s đã sẵn được đặt thành cài đặt tự động rồi.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s đã sẵn được đặt là giữ lại.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s đã sẵn được đặt là không giữ lại.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Cần %s nhưng mà không thấy nó ở đây" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s được đặt là giữ lại.\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Hủy bỏ nắm giữ %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" "Thực thi lệnh “dpkg” gặp lỗi. Bạn có cần quyền siêu người dùng để thực thi " "lệnh này" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -773,7 +774,7 @@ msgstr "" "Để tìm thông tin thêm, xem hai trang man (hướng dẫn)\n" " apt-mark(8) và apt.conf(5)" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -839,52 +840,52 @@ msgstr "Không thể bỏ gắn đĩa CD-ROM trong %s. Có lẽ nó vẫn đang msgid "Disk not found." msgstr "Không tìm thấy đĩa." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "Không tìm thấy tập tin" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu bằng “//”" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Đang đăng nhập vào" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Không thể quyết định tên ngang hàng" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Không thể phân giải tên cục bộ" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Máy phục vụ đã từ chối kết nối, và đã nói: %s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Lệnh USER (người dùng) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -892,121 +893,123 @@ msgstr "" "Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. " "“Acquire::ftp::ProxyLogin” là rỗng." -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "Thời hạn kết nối" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "Lỗi đọc" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Một trả lời đã tràn bộ đệm." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "Lỗi ghi" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Không thể tạo ổ cắm" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "Gặp lỗi" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Không thể kết nối ổ cắm bị động." -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Không thể đóng kết ổ cắm" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Không thể lắng nghe trên ổ cắm đó" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Không thể quyết định tên ổ cắm đó" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Không thể gửi lệnh PORT (cổng)" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Không biết họ địa chỉ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Quá giờ kết nối ổ cắm dữ liệu" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "Gặp vấn đề băm tập tin" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Không thể lấy tập tin: máy phục vụ nói “%s”" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Ổ cắm dữ liệu đã quá giờ" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói “%s”" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Truy vấn" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Không thể gọi " @@ -1042,7 +1045,7 @@ msgstr "Không thể kết nối đến %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s" @@ -1072,22 +1075,22 @@ msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - % msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s: %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ: Chữ ký đúng, nhưng không thể xác định vân tay của khóa?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ ký không hợp lệ." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1096,156 +1099,156 @@ msgstr "" "Tập tin Clearsigned không hợp lệ, nhận được “%s” (mạng yêu cầu xác nhận phải " "không?)" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi không rõ khi thực hiện gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây không hợp lệ:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ: Máy chủ đã đóng kết nối" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin đầu ra" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "Đang đợi phần đầu dữ liệu..." -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "Dòng đầu sai" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "Máy phục vụ HTTP đã gửi một dòng đầu trả lời không hợp lệ" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Máy phục vụ HTTP đã gửi một dòng đầu Content-Length (độ dài nội dung) không " "hợp lệ" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Máy phục vụ HTTP đã gửi một dòng đầu Content-Range (phạm vi nội dung) không " "hợp lệ" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "Máy phục vụ HTTP không hỗ trợ tải một phần tập tin" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "Không rõ định dạng ngày" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "Dữ liệu phần đầu sai" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "Kết nối bị lỗi" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "Gặp lỗi nội bộ" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "Đang liệt kê" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng!" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: Tiến trình Sắp xếp chưa xong" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" "Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho <apt@packages.debian.org>" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Cần phải lấy %sB/%sB từ kho chứa.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Cần phải lấy %sB từ kho chứa.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ bị chiếm dụng.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s." -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng " @@ -1253,11 +1256,11 @@ msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Có, làm đi!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1268,19 +1271,19 @@ msgstr "" "Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n" "?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "Hủy bỏ." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "Bạn có muốn tiếp tục không?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1289,20 +1292,20 @@ msgstr "" "nhật)\n" "hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện." -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "Không thể sửa những gói còn thiếu." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "Đang hủy bỏ tiến trình cài đặt." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1313,15 +1316,15 @@ msgstr[0] "" "Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói " "khác ghi đè:" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg." -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1339,15 +1342,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hỏng một thứ gì đó" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1356,23 +1359,23 @@ msgid_plural "" msgstr[0] "" "(Các) gói sau đây đã được tự động cài đặt nên không còn cần yêu cầu lại:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng." -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Có lẽ bạn cần chạy lệnh “apt-get -f install” để sửa những cái đó:" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1380,7 +1383,7 @@ msgstr "" "Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt-get -f install” mà " "không có gói nào (hoặc chỉ định cách thức giải quyết)." -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1392,142 +1395,142 @@ msgstr "" "chưa ổn định cái mà yêu cầu các gói mà nó còn chưa được tạo ra\n" "hay chưa được chuyển ra khỏi phần Incoming (Đến)." -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "Gói bị hỏng" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "Các gói đề nghị:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "Gói khuyến khích:" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "CẢNH BÁO: Không thể xác thực những gói theo đây!" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "Cảnh báo xác thực bị đè.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "Một số gói không thể được xác thực" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "Cài đặt những gói này mà không cần thẩm tra?" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy về %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "không hiểu" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, c-format msgid "[installed,upgradable to: %s]" msgstr "[đã cài, có thể nâng cấp thành: %s]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 msgid "[installed,local]" msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "[đã cài,có thể tự động gỡ bỏ]" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 msgid "[installed,automatic]" msgstr "[đã cài đặt,tự động]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 msgid "[installed]" msgstr "[đã cài đặt]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "[có thể nâng cấp từ: %s]" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "[residual-config]" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "nhưng mà nó không được cài đặt" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " hay" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "Những gói sau sẽ bị GỠ BỎ:" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "Những gói sau đây được giữ lại:" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "Những gói sau đây sẽ được NÂNG CẤP:" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "Những gói sau đây sẽ bị HẠ CẤP:" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1535,27 +1538,27 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nâng cấp, %lu được cài đặt mới, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "%lu bị hạ cấp, " -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" @@ -1564,7 +1567,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "[C/k]" @@ -1572,89 +1575,89 @@ msgstr "[C/k]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "[c/K]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "C" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "K" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Đang sửa chữa quan hệ phụ thuộc..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " gặp lỗi." -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Không thể sửa phần phụ thuộc" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Không thể tối thiểu hóa tập hợp nâng cấp" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Xong" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên." -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”." -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "Đang sắp xếp" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhận đối số" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "Đang tính toán nâng cấp... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 msgid "Internal error, Upgrade broke stuff" msgstr "Lỗi nội bộ: Upgrade (Nâng cấp) đã làm hỏng thứ gì đó" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "Xong" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "Tìm kiếm toàn văn" -#: apt-private/private-show.cc:152 -#, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +#: apt-private/private-show.cc:156 +#, fuzzy, c-format +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "Ở đây có %lu bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "không là gói thật (ảo)" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1666,43 +1669,43 @@ msgstr "" " Cần nhớ rằng chức năng khóa đã bị tắt,\n" " nên có thể nó không chính xác như những gì làm thật!" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, c-format msgid "Failed to parse %s. Edit again? " msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? " -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format 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:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Tìm thấy " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Lấy:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Bỏq " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Lỗi " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, 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:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [Đang hoạt động]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1715,19 +1718,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "Không thể đọc %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "Không thể chuyển đổi sang %s" @@ -1756,11 +1759,11 @@ msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”" msgid "[Mirror: %s]" msgstr "[Bản sao: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng bất ngờ" @@ -1800,7 +1803,7 @@ msgstr "" msgid "Merging available information" msgstr "Đang hòa trộn các thông tin sẵn có..." -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1828,40 +1831,40 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "Danh sách mở rộng gói quá dài" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "Gặp lỗi khi xử lý thư mục %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "Danh sách mở rộng nguồn quá dài" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "Gặp lỗi khi xử lý nội dung %s" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1957,26 +1960,26 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "Không có cái được chọn khớp được" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1984,192 +1987,192 @@ msgstr "" "Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " "apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "Kho không có mục ghi điều khiển" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "Không thể lấy con trỏ" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "CB: Không thể đọc thư mục %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "CB: Không thể lấy thông tin thống kê %s\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "L: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "CB: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "LỖI: có lỗi áp dụng vào tập tin " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "Gặp lỗi khi phân giải %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "Việc di chuyển qua cây bị lỗi" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "Gặp lỗi khi mở %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " Bỏ liên kết %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "Gặp lỗi khi đọc liên kết %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "Việc bỏ liên kết %s bị lỗi" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Gặp lỗi khi liên kết %s đến %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè (override)\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo trì %s là %s không phải %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè (override) nguồn\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Không thể mở %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, c-format msgid "Malformed override %s line %llu (%s)" msgstr "Sai “override” %s dòng %llu (%s)" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Việc đọc tập tin đè %s bị lỗi" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Sai override %s dòng %llu #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Sai override %s dòng %llu #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Sai override %s dòng %llu #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Không biết thuật toán nén “%s”" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Gặp lỗi khi rẽ nhánh tiến trình" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "Nén con" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Gặp lỗi khi đọc trong khi tính MD5" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Gặp lỗi khi bỏ liên kết %s" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Việc đổi tên %s thành %s bị lỗi" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2224,157 +2227,157 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Việc thực hiện gzip bị lỗi " -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "Chữ ký kho không hợp lệ" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "Phần đầu thành viên kho không hợp lê" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "Kho quá ngắn" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "Việc đọc phần đầu kho bị lỗi" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Gặp lỗi khi định vị phần tử băm!" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Gặp lỗi khi định vị trệch đi" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Sự trệch đi được thêm hai lần %s → %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Việc ghi tập tin %s gặp lỗi" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Việc đóng tập tin %s gặp lỗi" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "Đường dẫn %s quá dài" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "Đang giải nén %s nhiều lần" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "Thư mục %s bị trệch hướng" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "Đường dẫn trệch đi quá dài" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "Gặp lỗi định vị điểm nút trong hộp băm nó bị lỗi" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "Đường dẫn quá dài" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "Không thể lấy thông tin thống kê %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "Tập tin điều khiển không có khả năng phân tách" @@ -2434,209 +2437,204 @@ msgstr "" "dùng tắt đi." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li ngày %li giờ %li phút %li giây" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%li giờ %li phút %li giây" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%li phút %li giây" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%li giây" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Không chấp nhận kiểu viết tắt: “%c”" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " "số" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Lỗi!" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... Xong" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "..." #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, c-format msgid "%c%s... %u%%" msgstr "%c%s... %u%%" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Không hiểu tùy chọn dòng lệnh “%c” [từ %s]." -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "Không hiểu tùy chọn dòng lệnh %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "Tùy chọn %s yêu cầu một đối số." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”." -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "Tùy chọn “%s” quá dài" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "Thao tác “%s” không hợp lệ" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gặp vấn đề khi đóng tập tin gzip %s" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2644,286 +2642,296 @@ msgstr "" "Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " "lệ" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "Tiến trình con %s đã nhận tín hiệu %u." -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất thường" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gặp vấn đề khi đóng tập tin gzip %s" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "Gặp lỗi khi thực hiện nén " -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, c-format msgid "read, still have %llu to read but none left" msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, c-format 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:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, 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:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, 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:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "Không có vòng khoá nào được cài đặt vào %s." -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Bộ nhớ tạm gói trống" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Tập tin nhớ tạm gói bị hỏng" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 msgid "The package cache file is corrupted, it is too small" msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Phụ thuộc" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "Phụ thuộc sẵn" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Đề nghị" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Khuyến khích" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Xung đột" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Thay thế" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Cũ" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "Làm hỏng" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "Tăng cường" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "quan trọng" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "yêu cầu" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "chuẩn" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "tùy chọn" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "bổ sung" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "Đang xây dựng cây quan hệ phụ thuộc" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "Phiên bản ứng cử" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "Tạo ra quan hệ phụ thuộc" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "Đang đọc thông tin về tình trạng" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "Lỗi mở tập tin tình trạng StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Không thể phân tích tập tin gói %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" "Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " "tích được)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " "gán)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " "trị)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Đang mở %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2932,12 +2940,12 @@ msgstr "" "Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." "conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, c-format msgid "Could not configure '%s'. " msgstr "Không thể cấu hình “%s”. " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2949,18 +2957,18 @@ msgstr "" "bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" "LoopBreak” (buộc ngắt vòng lặp)." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2968,91 +2976,91 @@ msgstr "" "Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "Thiếu thư mục danh sách %spartial." -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "Thiếu thư mục kho lưu %spartial." -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "Không thể khoá thư mục %s" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "Đang tải tập tin %li trong tổng số %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, 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:115 +#: apt-pkg/acquire-worker.cc:118 #, c-format msgid "Is the package %s installed?" msgstr "Gói “%s” đã được cài đặt chưa?" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, 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:452 +#: apt-pkg/acquire-worker.cc:455 #, 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." -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Không hỗ trợ hệ thống đóng gói “%s”" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "Không thể lấy trạng thái về %s." -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " "này" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3061,97 +3069,92 @@ msgstr "" "Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " "không sẵn có trong mã nguồn" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Mã băm tổng kiểm tra không khớp" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Kích cỡ không khớp nhau" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 msgid "Invalid file format" msgstr "Định dạng tập tập tin không hợp lệ" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3160,16 +3163,16 @@ msgstr "" "Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " "sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3178,12 +3181,12 @@ msgstr "" "Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " "này sẽ không được áp dụng." -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3194,12 +3197,12 @@ msgstr "" "Lỗi GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3208,12 +3211,12 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3221,70 +3224,70 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "Không có phần nào trong tập tin Phát hành %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" "Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " "hành %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" "Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Khối nhà bán %s không chứa vân tay" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "Đang bỏ gắn CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "Đang đợi đĩa...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "Đang gắn đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "Đang nhận diện... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "Nhãn đã lưu: %s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "Đang bỏ gắn CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3292,7 +3295,7 @@ msgid "" msgstr "" "Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3300,16 +3303,16 @@ msgstr "" "Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " "hoặc có kiến trúc không đúng?" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "Tìm thấy nhãn “%s”\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3318,34 +3321,34 @@ msgstr "" "Tên đĩa này:\n" "“%s”\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "Đang sao chép các danh sách gói..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "Đang ghi danh sách nguồn mới\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "Các mục tin danh sách nguồn cho đĩa này:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "Đã ghi %i bản ghi.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3362,37 +3365,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:479 +#: apt-pkg/cacheset.cc:487 #, 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:482 +#: apt-pkg/cacheset.cc:490 #, 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:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "Không tìm thấy tác vụ “%s”" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, 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:605 +#: apt-pkg/cacheset.cc:613 #, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Không tìm thấy gói nào theo đường dẫn “%s”" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, 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:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3401,53 +3404,53 @@ 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:637 +#: apt-pkg/cacheset.cc:645 #, 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:645 +#: apt-pkg/cacheset.cc:653 #, 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:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" "Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " "đặt" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "Gửi kịch bản đến bộ phân giải" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "Gửi yêu cầu đến bộ phân giải" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "Chuẩn bị để lấy cách giải quyết" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "Thi hành bộ phân giải từ bên ngoài" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "Diễn biến: [%3i%%]" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "Đang chạy dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3455,119 +3458,119 @@ msgstr "" "Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " "được dùng thay thế." -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "Đang cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "Đang gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "Đang ghi chép sự biến mất của %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "Đang chạy bẫy sau-cài-đặt %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "Thiếu thư mục “%s”" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "Không thể mở tập tin “%s”" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "ioctl(TIOCGWINSZ) gặp lỗi" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, c-format msgid "Can not write log (%s)" msgstr "Không thể ghi nhật ký (%s)" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "/dev/pts đã gắn chưa?" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "Đầu ra là thiết bị cuối?" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" "Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3575,14 +3578,14 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " "do một sự thất bại trước đó." -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3590,7 +3593,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " "bộ nhớ”" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3598,13 +3601,13 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " "thống nội bộ" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " @@ -3613,14 +3616,14 @@ msgstr "" "Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " "phải không?" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " @@ -3628,7 +3631,7 @@ msgstr "" "dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " "vấn đề này. " -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "Chưa được khoá" diff --git a/po/zh_CN.po b/po/zh_CN.po index 970e35138..4ee8099bb 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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" @@ -19,153 +19,153 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "软件包名称总数：" -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "全部软件包结构：" -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " 普通软件包：" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " 完全虚拟软件包：" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " 单虚拟软件包：" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包：" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " 缺失：" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "按版本共计：" -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "按不同的说明共计：" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "按依赖关系共计：" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "按版本/文件关系共计：" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "按说明/文件关系共计：" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "提供映射共计：" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Glob 字串共计：" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计：" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Slack 空间共计：" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "总占用空间：" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "被锁定的软件包：" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(没有找到)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " 候选软件包：" -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " 软件包锁：" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -239,28 +239,28 @@ msgstr "" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "请把盘片插入驱动器再按回车键" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "无法将 %s 挂载到 %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" @@ -296,65 +296,65 @@ msgstr "" " -c=? 读取指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "选择 %s 作为源代码包而非 %s\n" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, fuzzy, c-format msgid "Can not find version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" @@ -379,114 +379,114 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,37 +495,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -613,7 +613,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "要下载源代码，必须指定至少一个对应的软件包" @@ -622,7 +622,7 @@ msgstr "要下载源代码，必须指定至少一个对应的软件包" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -635,53 +635,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "但是它还没有被安装" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s 已设置为手动安装。\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "无法打开 %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -708,7 +708,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -756,173 +756,175 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "无效的 URI，本地的 URI 不能以 // 开头" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "正在登录" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "无法获知对方主机名" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "无法获知本地主机名" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "服务器拒绝了我们的连接，响应信息为：%s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "连接超时" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "读错误" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "回应超出了缓存区大小。" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "失败" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "无法调用 " @@ -958,7 +960,7 @@ msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@ -988,181 +990,181 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由于没有公钥，无法验证下列签名：\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "错误的报头行" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "该 HTTP 服务器发送了一个无效的应答报头" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "该 HTTP 服务器的 range 支持不正常" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "连接失败" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "内部错误" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "是，按我说的做！" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1173,19 +1175,19 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "中止执行。" -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 msgid "Do you want to continue?" msgstr "您希望继续执行吗？" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1193,19 +1195,19 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "中止安装。" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1214,15 +1216,15 @@ msgid_plural "" "all files have been overwritten by other packages:" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1238,15 +1240,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1254,24 +1256,24 @@ msgid_plural "" "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "使用'apt-get autoremove'来卸载它们" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1279,7 +1281,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1290,145 +1292,145 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "破损的软件包" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列软件包不能通过验证！" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "不经验证就安装这些软件包吗？" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [已安装]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1436,27 +1438,27 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1465,7 +1467,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1473,90 +1475,90 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " 失败。" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " 完成" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "完成" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1567,43 +1569,43 @@ msgstr "" "　　　apt-get 需要 root 特权进行实际的执行。\n" "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "无法将 %s 重命名为 %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "命中 " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "获取：" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "忽略 " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "错误 " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "下载 %sB，耗时 %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [执行中]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1616,19 +1618,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" @@ -1657,11 +1659,11 @@ msgstr "没有找到镜像文件 %s" msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "连接被永久关闭" @@ -1699,7 +1701,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们， msgid "Merging available information" msgstr "正在合并可用信息" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1723,40 +1725,40 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "软件包的扩展列表太长" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "源扩展列表太长" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "将头写入到目录文件时出错" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1836,218 +1838,218 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "数据库已过期，现尝试进行升级 %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开数据库文件 %s：%s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "无法获得游标" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：无法读取目录 %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：无法获得 %s 的状态\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "错误：" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "错误：处理文件时出错 " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "无法解析 %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "无法使用 unlink 删除 %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "无法打开 %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "override 文件 %s 第 %lu 行的格式有误 #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "无法读取 override 文件 %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "override 文件 %s 第 %lu 行的格式有误 #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "override 文件 %s 第 %lu 行的格式有误 #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误，无法创建 %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2100,157 +2102,157 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar 的校验和不符，文件已损坏" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "无效的归档签名" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "读取归档成员文件头出错" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, c-format msgid "Invalid archive member header %s" msgstr "归档文件中成员文件头 %s 无效" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "归档文件中成员文件头无效" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "归档文件太短" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "无法读取归档文件的数据头" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "把 DropNode 用在了仍在链表中的节点上" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "无法定位哈希表元素！" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "无法分配转移项" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "内部错误，出现在 AddDiversion" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "添加了两个转移项 %s-> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "路径名 %s 太长" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "%s 被解包了不只一次" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "目录 %s 已被转移" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "该软件包正尝试写入转移对象 %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "该转移路径太长" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "目录 %s 要被一个非目录的文件替换" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "无法在其散列桶中分配节点" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "路径名太长" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "用来覆盖的软件包不属于 %s 的任何版本" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "无法读取 %s 的状态" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部错误，无法定位包内文件 %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "不能解析的主控文件" @@ -2307,482 +2309,487 @@ msgid "" msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li天 %li小时 %li分 %li秒" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "%li小时 %li分 %li秒" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "%li分 %li秒" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "%li秒" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "找不到您选则的 %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u：配置值后有多余的无意义数据" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u：Included from here" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u：不支持的指令“%s”" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 有错误！" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... 完成" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "未知的命令行选项“%c” [来自 %s]" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "无法识别命令行选项 %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "命令行选项 %s 不是布尔值" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "选项 %s 要求有一个参数" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "选项“%s”太长" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "不能识别参数 %s，请用 true 或 false" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "无效的操作 %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "无法读取盘片的状态" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "关闭 gzip %s 文件出错" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, c-format msgid "Sub-process %s received signal %u." msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "关闭 gzip %s 文件出错" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, c-format msgid "Could not open file descriptor %d" msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "无法创建子进程的 IPC 管道" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "同步文件出错" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "无法重命名文件，%s (%s -> %s)。" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, c-format msgid "No keyring installed in %s." msgstr "%s 中没有安装密钥环。" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "软件包缓存区是空的" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "软件包缓存文件损坏了" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "软件包缓存区文件的版本不兼容" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "软件包缓存文件损坏了" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本程序目前不支持“%s”版本系统" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "软件包缓存区是为其它架构的硬件构建的" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "依赖" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "预依赖" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "推荐" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "冲突" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "替换" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "废弃" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "破坏" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "增强" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "必需" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "标准" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "可选" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "额外" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "生成依赖关系" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "正在读取状态信息" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "无法打开状态文件 %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "无法写入临时状态文件 %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2791,12 +2798,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "无法打开文件 %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2807,18 +2814,18 @@ msgstr "" "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::" "Force-LoopBreak 选项。" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "不支持索引文件类型“%s”" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2826,215 +2833,210 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, c-format msgid "List directory %spartial is missing." msgstr "软件包列表的目录 %spartial 缺失。" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, c-format msgid "Archives directory %spartial is missing." msgstr "仓库目录 %spartial 确实。" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, c-format msgid "Unable to lock directory %s" msgstr "无法对目录 %s 加锁" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "正在下载第 %li 个文件，共 %li 个" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "无法读取 %s 的状态。" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包的列表或是状态文件。" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "无法读取源列表。" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "无法识别锁定的类型 %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "软件包暂存区使用的是不兼容的版本控制系统" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "处理 %s (FindPkg)时出错" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "哇，软件包数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "哇，软件包版本数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "哇，软件包说明数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "正在读取软件包列表" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "无法重命名文件，%s (%s -> %s)。" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "大小不符" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "无效的操作 %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3043,12 +3045,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3057,78 +3059,78 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "软件包仓库 Release 文件 %s 内无组件章节信息" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "软件包仓库 Release 文件 %s 内无哈希条目" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸载 CD-ROM...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "正在鉴别... " -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "已归档文件的标签：%s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸载 CD-ROM...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "正在盘片中查找索引文件...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3137,7 +3139,7 @@ msgstr "" "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签" "名\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3145,16 +3147,16 @@ msgstr "" "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" "架。" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "找到标签 '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请重试。\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3163,34 +3165,34 @@ msgstr "" "这张盘片现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "正在写入新的源列表\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" @@ -3205,88 +3207,88 @@ msgstr "无法找到认证记录：%s" msgid "Hash mismatch for: %s" msgstr "Hash 校验和不符：%s" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, c-format msgid "Couldn't find task '%s'" msgstr "无法找到任务 %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "无法从完全虚拟的软件包 %s 中选择版本" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, 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:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "因为软件包 %s 没有候选版本，无法进行选择" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "正在运行 dpkg" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3294,168 +3296,168 @@ msgid "" msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, c-format msgid "Completely removing %s" msgstr "完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "注意到 %s 已经消失" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 缺失" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Could not open file '%s'" msgstr "无法打开文件 %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "无法写入 %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "未锁定" diff --git a/po/zh_TW.po b/po/zh_TW.po index bbe96b72d..5199b3f99 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-28 10:56+0100\n" +"POT-Creation-Date: 2014-03-14 09:13+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." @@ -18,155 +18,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "套件 %s 版本 %s 未能滿足相依性：\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "套件名稱合計：" -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "套件名稱合計：" -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " 一般套件：" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " 完全虛擬套件：" -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " 單一虛擬套件：" -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " 混合虛擬套件：" -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " 找不到：" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "個別版本合計：" -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "個別版本類別合計：" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "相依關係合計：" -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "版本/檔案關聯合計：" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "類別/檔案關聯合計：" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "提供者對應合計：" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "所有字串合計：" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "相依版本空間合計：" -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "間暇空間合計：" -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "統計後的空間合計：" -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "套件檔 %s 未同步。" -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441 +#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "未找到套件" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1254 #, fuzzy msgid "You must give at least one search pattern" msgstr "您必須明確得給定一個樣式" -#: cmdline/apt-cache.cc:1411 +#: cmdline/apt-cache.cc:1420 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 +#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 #, c-format msgid "Unable to locate package %s" msgstr "找不到套件 %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1545 msgid "Package files:" msgstr "套件檔：" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 msgid "Cache is out of sync, can't x-ref a package file" msgstr "快取資料未同步，無法 x-ref 套件檔" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1566 msgid "Pinned packages:" msgstr "鎖定的套件：" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 msgid "(not found)" msgstr "(未找到)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1586 msgid " Installed: " msgstr " 已安裝：" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1587 msgid " Candidate: " msgstr " 候選：" -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 msgid "(none)" msgstr "(無)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1620 msgid " Package pin: " msgstr " 套件鎖定：" #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1629 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:216 +#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -239,29 +239,29 @@ msgstr "" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" "請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "請替這張光碟取個名字，像是 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 msgid "Please insert a Disc in the drive and press enter" msgstr "請把光碟放入光碟機，然後按下 [Enter] 鍵" -#: cmdline/apt-cdrom.cc:141 +#: cmdline/apt-cdrom.cc:139 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "無法將 %s 更名為 %s" -#: cmdline/apt-cdrom.cc:196 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "請對您的光碟組中的其它光碟重複相同的操作。" @@ -297,65 +297,65 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "無法找到套件 %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "無法找到套件 %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "無法找到套件 %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "無法取得來源套件列表 %s 的狀態" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "無法找到套件 %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤，問題排除器造成了損壞" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "無法鎖定下載目錄" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 的原始碼套件" @@ -375,114 +375,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:840 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "無法確認 %s 的未使用空間" -#: cmdline/apt-get.cc:877 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s" msgstr "在 %s 裡沒有足夠的的未使用空間" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:883 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %sB/%sB 的原始套件檔。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:888 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:897 +#: cmdline/apt-get.cc:894 #, c-format msgid "Fetch source %s\n" msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:912 msgid "Failed to fetch some archives." msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "下載完成，且這是『僅下載』模式" -#: cmdline/apt-get.cc:949 +#: cmdline/apt-get.cc:942 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "不解開，因原始碼已解開至 %s\n" -#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:954 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:962 +#: cmdline/apt-get.cc:955 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 #, c-format msgid "Build command '%s' failed.\n" msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1002 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1021 msgid "Must specify at least one package to check builddeps for" msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:1048 +#: cmdline/apt-get.cc:1046 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1093 #, c-format msgid "%s has no build depends.\n" msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:1265 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1281 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1304 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1343 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -490,37 +490,37 @@ msgid "" msgstr "" "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1349 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1372 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1387 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:1394 +#: cmdline/apt-get.cc:1392 msgid "Failed to process build dependencies" msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正和 %s (%s) 連線" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "已支援模組：" -#: cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1624 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -606,7 +606,7 @@ msgstr "" "以取得更多資訊和選項。\n" " 該 APT 有著超級牛力。\n" -#: cmdline/apt-helper.cc:39 +#: cmdline/apt-helper.cc:35 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "在取得原始碼時必須至少指定一個套件" @@ -615,7 +615,7 @@ msgstr "在取得原始碼時必須至少指定一個套件" msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:67 +#: cmdline/apt-helper.cc:65 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -628,53 +628,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "但它卻尚未安裝" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "%s 已經是最新版本了。\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "%s 已經是最新版本了。\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1182 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:811 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1186 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它並不存在" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "無法開啟 %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -701,7 +701,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -748,173 +748,175 @@ msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。" msgid "Disk not found." msgstr "找不到磁碟。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 msgid "File not found" msgstr "找不到檔案" -#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 -#: methods/rred.cc:609 +#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 +#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "無法設定修改時間" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "不正確的 URI，本機 URI 不應以 // 開頭" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "登入中" -#: methods/ftp.cc:178 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "無法解析對方主機名稱" -#: methods/ftp.cc:183 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "無法解析本機名稱" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "伺服器不接受連線，並回應：%s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。" -#: methods/ftp.cc:275 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 msgid "Connection timeout" msgstr "連線逾時" -#: methods/ftp.cc:345 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "伺服器已關閉連線" -#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1451 +#: apt-pkg/contrib/fileutl.cc:1460 apt-pkg/contrib/fileutl.cc:1465 +#: apt-pkg/contrib/fileutl.cc:1467 msgid "Read error" msgstr "讀取錯誤" -#: methods/ftp.cc:355 methods/rsh.cc:205 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "回應超過緩衝區長度。" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "協定失敗" -#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:871 +#: apt-pkg/contrib/fileutl.cc:1573 apt-pkg/contrib/fileutl.cc:1582 +#: apt-pkg/contrib/fileutl.cc:1587 apt-pkg/contrib/fileutl.cc:1589 +#: apt-pkg/contrib/fileutl.cc:1614 msgid "Write error" msgstr "寫入錯誤" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "無法建立 Socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" msgstr "無法和 data socket 連線，連線逾時" -#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28 msgid "Failed" msgstr "失敗" -#: methods/ftp.cc:713 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "無法和 passive socket 連線。" -#: methods/ftp.cc:730 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 無法取得監聽 socket" -#: methods/ftp.cc:744 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "無法 bind 至 socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "無法監聽 socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "無法解析 socket 名稱" -#: methods/ftp.cc:787 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "無法送出 PORT 指令" -#: methods/ftp.cc:797 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "未知的地址家族 %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Data socket 連線逾時" -#: methods/ftp.cc:833 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "無法接受連線" -#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 +#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316 msgid "Problem hashing file" msgstr "有問題的雜湊檔" -#: methods/ftp.cc:885 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "無法取得檔案，伺服器回應 '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:331 +#: methods/ftp.cc:905 methods/rsh.cc:335 msgid "Data socket timed out" msgstr "Data socket 連線逾時" -#: methods/ftp.cc:930 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "資料傳輸失敗，伺服器回應 '%s'" #. Get the files information -#: methods/ftp.cc:1009 +#: methods/ftp.cc:1014 msgid "Query" msgstr "查詢" -#: methods/ftp.cc:1123 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "無法 invoke " @@ -950,7 +952,7 @@ msgstr "無法和 %s:%s (%s) 連線。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:439 #, c-format msgid "Connecting to %s" msgstr "正連線至 %s" @@ -980,182 +982,182 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事" msgid "Unable to connect to %s:%s:" msgstr "無法連線至 %s %s：" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "至少發現一個無效的簽章。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:174 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "在執行 gpgv 時發生未知的錯誤" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "以下簽名無效：\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:516 +#: methods/http.cc:508 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:530 +#: methods/http.cc:522 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:532 +#: methods/http.cc:524 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" -#: methods/http.cc:568 +#: methods/http.cc:560 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:628 +#: methods/http.cc:620 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:633 +#: methods/http.cc:625 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:656 +#: methods/http.cc:648 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" -#: methods/server.cc:56 +#: methods/server.cc:51 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/server.cc:114 +#: methods/server.cc:109 msgid "Bad header line" msgstr "標頭行錯誤" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:134 methods/server.cc:141 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 伺服器傳送了一個無效的回覆標頭" -#: methods/server.cc:176 +#: methods/server.cc:171 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭" -#: methods/server.cc:199 +#: methods/server.cc:194 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭" -#: methods/server.cc:201 +#: methods/server.cc:196 msgid "This HTTP server has broken range support" msgstr "這個 HTTP 伺服器的範圍支援有問題" -#: methods/server.cc:225 +#: methods/server.cc:220 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/server.cc:494 +#: methods/server.cc:489 msgid "Bad header data" msgstr "錯誤的標頭資料" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:506 methods/server.cc:562 msgid "Connection failed" msgstr "連線失敗" -#: methods/server.cc:659 +#: methods/server.cc:654 msgid "Internal error" msgstr "內部錯誤" -#: apt-private/private-list.cc:147 +#: apt-private/private-list.cc:132 msgid "Listing" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除，但卻被禁止移除。" -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，排序未能完成" -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:147 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下載 %sB/%sB 的套件檔。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下載 %sB 的套件檔。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n" -#: apt-private/private-install.cc:211 +#: apt-private/private-install.cc:199 #, c-format msgid "You don't have enough free space in %s." msgstr "在 %s 裡沒有足夠的的未使用空間。" -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 msgid "There are problems and -y was used without --force-yes" msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:249 +#: apt-private/private-install.cc:215 apt-private/private-install.cc:237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:231 +#: apt-private/private-install.cc:219 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: apt-private/private-install.cc:233 +#: apt-private/private-install.cc:221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1166,20 +1168,20 @@ msgstr "" "請輸入 '%s' 這個句子以繼續進行\n" " ?] " -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 msgid "Abort." msgstr "放棄執行。" -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:242 #, fuzzy msgid "Do you want to continue?" msgstr "是否繼續進行 [Y/n]？" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:312 msgid "Some files failed to download" msgstr "有部份檔案無法下載" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:319 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1187,19 +1189,19 @@ msgstr "" "有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選" "項？" -#: apt-private/private-install.cc:335 +#: apt-private/private-install.cc:323 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前尚未支援 --fix-missing 和媒體抽換" -#: apt-private/private-install.cc:340 +#: apt-private/private-install.cc:328 msgid "Unable to correct missing packages." msgstr "無法修正欠缺的套件。" -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:329 msgid "Aborting install." msgstr "放棄安裝。" -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1209,15 +1211,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:369 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:390 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover" -#: apt-private/private-install.cc:510 +#: apt-private/private-install.cc:498 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1235,15 +1237,15 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 msgid "The following information may help to resolve the situation:" msgstr "以下的資訊或許有助於解決當前的情況：" -#: apt-private/private-install.cc:517 +#: apt-private/private-install.cc:505 msgid "Internal Error, AutoRemover broke stuff" msgstr "內部錯誤，AutoRemover 處理失敗" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:512 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1253,7 +1255,7 @@ msgid_plural "" msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了：" msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:516 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1261,18 +1263,18 @@ msgid_plural "" msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了：" msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: apt-private/private-install.cc:530 +#: apt-private/private-install.cc:518 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "使用 'apt-get autoremove' 來將其移除。" msgstr[1] "使用 'apt-get autoremove' 來將其移除。" -#: apt-private/private-install.cc:624 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您也許得執行 'apt-get -f install' 以修正這些問題：" -#: apt-private/private-install.cc:626 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1280,7 +1282,7 @@ msgstr "" "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解" "決方案）。" -#: apt-private/private-install.cc:639 +#: apt-private/private-install.cc:627 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1290,145 +1292,145 @@ msgstr "" "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n" "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。" -#: apt-private/private-install.cc:660 +#: apt-private/private-install.cc:648 msgid "Broken packages" msgstr "損毀的套件" -#: apt-private/private-install.cc:713 +#: apt-private/private-install.cc:701 msgid "The following extra packages will be installed:" msgstr "下列的額外套件將被安裝：" -#: apt-private/private-install.cc:803 +#: apt-private/private-install.cc:791 msgid "Suggested packages:" msgstr "建議套件：" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:792 msgid "Recommended packages:" msgstr "推薦套件：" -#: apt-private/private-download.cc:32 +#: apt-private/private-download.cc:31 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：無法驗證下列套件！" -#: apt-private/private-download.cc:36 +#: apt-private/private-download.cc:35 msgid "Authentication warning overridden.\n" msgstr "忽略了驗證警告。\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 +#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 msgid "Some packages could not be authenticated" msgstr "有部份套件無法驗證" -#: apt-private/private-download.cc:46 +#: apt-private/private-download.cc:45 msgid "Install these packages without verification?" msgstr "是否不經驗證就安裝這些套件？" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" -#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 -#: apt-private/private-show.cc:86 +#: apt-private/private-output.cc:81 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:201 +#: apt-private/private-output.cc:207 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "【已安裝】" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:211 #, fuzzy msgid "[installed,local]" msgstr "【已安裝】" -#: apt-private/private-output.cc:208 +#: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:210 +#: apt-private/private-output.cc:216 #, fuzzy msgid "[installed,automatic]" msgstr "【已安裝】" -#: apt-private/private-output.cc:212 +#: apt-private/private-output.cc:218 #, fuzzy msgid "[installed]" msgstr "【已安裝】" -#: apt-private/private-output.cc:216 +#: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:220 +#: apt-private/private-output.cc:226 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:320 +#: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有未滿足的相依關係：" -#: apt-private/private-output.cc:410 +#: apt-private/private-output.cc:416 #, c-format msgid "but %s is installed" msgstr "但 %s 卻已安裝" -#: apt-private/private-output.cc:412 +#: apt-private/private-output.cc:418 #, c-format msgid "but %s is to be installed" msgstr "但 %s 卻將被安裝" -#: apt-private/private-output.cc:419 +#: apt-private/private-output.cc:425 msgid "but it is not installable" msgstr "但它卻無法安裝" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:427 msgid "but it is a virtual package" msgstr "但它是虛擬套件" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not installed" msgstr "但它卻尚未安裝" -#: apt-private/private-output.cc:424 +#: apt-private/private-output.cc:430 msgid "but it is not going to be installed" msgstr "但它卻將不會被安裝" -#: apt-private/private-output.cc:429 +#: apt-private/private-output.cc:435 msgid " or" msgstr "或" -#: apt-private/private-output.cc:458 +#: apt-private/private-output.cc:464 msgid "The following NEW packages will be installed:" msgstr "下列【新】套件將會被安裝：" -#: apt-private/private-output.cc:484 +#: apt-private/private-output.cc:490 msgid "The following packages will be REMOVED:" msgstr "下列套件將會被【移除】：" -#: apt-private/private-output.cc:506 +#: apt-private/private-output.cc:512 msgid "The following packages have been kept back:" msgstr "下列套件將會維持其原有版本：" -#: apt-private/private-output.cc:527 +#: apt-private/private-output.cc:533 msgid "The following packages will be upgraded:" msgstr "下列套件將會被升級：" -#: apt-private/private-output.cc:548 +#: apt-private/private-output.cc:554 msgid "The following packages will be DOWNGRADED:" msgstr "下列套件將會被【降級】：" -#: apt-private/private-output.cc:568 +#: apt-private/private-output.cc:574 msgid "The following held packages will be changed:" msgstr "下列被保留 (hold) 的套件將會被更改：" -#: apt-private/private-output.cc:623 +#: apt-private/private-output.cc:629 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: apt-private/private-output.cc:631 +#: apt-private/private-output.cc:637 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1436,27 +1438,27 @@ msgstr "" "【警告】：下列的基本套件都將被移除。\n" "除非您很清楚您在做什麼，否則請勿輕易嘗試！" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升級 %lu 個，新安裝 %lu 個，" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:672 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個，" -#: apt-private/private-output.cc:668 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu downgraded, " msgstr "降級 %lu 個，" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:676 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "移除 %lu 個，有 %lu 個未被升級。\n" -#: apt-private/private-output.cc:674 +#: apt-private/private-output.cc:680 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個沒有完整得安裝或移除。\n" @@ -1465,7 +1467,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:696 +#: apt-private/private-output.cc:702 msgid "[Y/n]" msgstr "" @@ -1473,91 +1475,91 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:702 +#: apt-private/private-output.cc:708 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:713 +#: apt-private/private-output.cc:719 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:719 +#: apt-private/private-output.cc:725 msgid "N" msgstr "" -#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" -#: apt-private/private-cachefile.cc:87 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "正在修正相依關係..." -#: apt-private/private-cachefile.cc:90 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " 失敗。" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "無法修正相依關係" -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "無法將升級計劃最小化" -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " 完成" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。" -#: apt-private/private-cachefile.cc:105 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "未能滿足相依關係。試試 -f 選項。" -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 +#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" msgstr "" -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: apt-private/private-upgrade.cc:19 +#: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " msgstr "籌備升級中... " -#: apt-private/private-upgrade.cc:24 +#: apt-private/private-upgrade.cc:30 #, fuzzy msgid "Internal error, Upgrade broke stuff" msgstr "內部錯誤，AllUpgrade 造成了損壞" -#: apt-private/private-upgrade.cc:26 +#: apt-private/private-upgrade.cc:32 msgid "Done" msgstr "完成" -#: apt-private/private-search.cc:61 +#: apt-private/private-search.cc:51 msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:23 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1565,43 +1567,43 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "無法將 %s 更名為 %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:63 +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "已有 " -#: apt-private/acqprogress.cc:87 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "下載:" -#: apt-private/acqprogress.cc:118 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "略過 " -#: apt-private/acqprogress.cc:122 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "錯誤 " -#: apt-private/acqprogress.cc:143 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "取得 %sB 用了 %s (%sB/s)\n" -#: apt-private/acqprogress.cc:233 +#: apt-private/acqprogress.cc:236 #, c-format msgid " [Working]" msgstr " [工作中]" -#: apt-private/acqprogress.cc:294 +#: apt-private/acqprogress.cc:297 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1614,19 +1616,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 +#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:367 +#: apt-pkg/contrib/fileutl.cc:480 apt-pkg/sourcelist.cc:280 +#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381 #, c-format msgid "Unable to read %s" msgstr "無法讀取 %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497 +#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 +#: apt-pkg/clean.cc:127 #, c-format msgid "Unable to change to %s" msgstr "無法切換至 %s" @@ -1655,11 +1657,11 @@ msgstr "無法開啟檔案 %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "無法和子程序建立 IPC 管線" -#: methods/rsh.cc:339 +#: methods/rsh.cc:343 msgid "Connection closed prematurely" msgstr "連線突然終止" @@ -1699,7 +1701,7 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]" msgid "Merging available information" msgstr "整合現有的資料" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:223 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1723,40 +1725,40 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:255 apt-pkg/pkgcachegen.cc:1400 #, c-format msgid "Unable to write to %s" msgstr "無法寫入 %s" -#: cmdline/apt-extracttemplates.cc:298 +#: cmdline/apt-extracttemplates.cc:297 msgid "Cannot get debconf version. Is debconf installed?" msgstr "無法取得 debconf 版本。是否有安裝 debconf？" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 msgid "Package extension list is too long" msgstr "套件延伸列表過長" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 +#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 +#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 #, c-format msgid "Error processing directory %s" msgstr "處理目錄 %s 時發生錯誤" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:271 msgid "Source extension list is too long" msgstr "原始碼的延伸列表太長" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:388 msgid "Error writing header to contents file" msgstr "寫入標頭資訊到內容檔時發生錯誤" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:418 #, c-format msgid "Error processing contents %s" msgstr "處理內容 %s 時發生錯誤" -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:606 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1834,26 +1836,26 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:812 msgid "No selections matched" msgstr "找不到符合的選項" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:890 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "套件檔案組 `%s' 少了部份檔案" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:51 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB 已損毀，檔案被更名為 %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:69 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 過舊，嘗試升級 %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:80 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -1861,192 +1863,192 @@ msgid "" msgstr "" "資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:85 #, c-format msgid "Unable to open DB file %s: %s" msgstr "無法開啟 DB 檔 %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" -#: ftparchive/cachedb.cc:249 +#: ftparchive/cachedb.cc:253 msgid "Archive has no control record" msgstr "套件檔沒有 control 記錄" -#: ftparchive/cachedb.cc:490 +#: ftparchive/cachedb.cc:494 msgid "Unable to get a cursor" msgstr "無法取得遊標" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:91 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：無法讀取目錄 %s\n" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:96 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：無法取得 %s 狀態\n" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:152 msgid "E: " msgstr "錯誤：" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:154 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:161 msgid "E: Errors apply to file " msgstr "錯誤：套用到檔案時發生錯誤" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format msgid "Failed to resolve %s" msgstr "無法解析 %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:192 msgid "Tree walking failed" msgstr "無法走訪目錄樹" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:219 #, c-format msgid "Failed to open %s" msgstr "無法開啟 %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:278 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:286 #, c-format msgid "Failed to readlink %s" msgstr "無法讀取連結 %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:290 #, c-format msgid "Failed to unlink %s" msgstr "無法移除連結 %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:298 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 無法將 %s 連結到 %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:308 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:413 msgid "Archive had no package field" msgstr "套件檔裡沒有套件資訊" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s 沒有重新定義項目\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的維護者是 %s，而非 %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s 沒有原始碼重新定義項目\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 也沒有二元碼重新定義項目\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 msgid "realloc - Failed to allocate memory" msgstr "realloc - 無法配置記憶體" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "無法開啟 %s" #. skip spaces #. find end of word -#: ftparchive/override.cc:65 +#: ftparchive/override.cc:68 #, fuzzy, c-format msgid "Malformed override %s line %llu (%s)" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "無法讀取重新定義檔 %s" -#: ftparchive/override.cc:163 +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" -#: ftparchive/override.cc:175 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2" -#: ftparchive/override.cc:188 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3" -#: ftparchive/multicompress.cc:71 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的壓縮演算法 '%s'" -#: ftparchive/multicompress.cc:101 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "要壓縮輸出 %s 需搭配壓縮動作" -#: ftparchive/multicompress.cc:190 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "無法建立 FILE*" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "fork 時失敗" -#: ftparchive/multicompress.cc:207 +#: ftparchive/multicompress.cc:209 msgid "Compress child" msgstr "壓縮子程序" -#: ftparchive/multicompress.cc:230 +#: ftparchive/multicompress.cc:232 #, c-format msgid "Internal error, failed to create %s" msgstr "內部錯誤，無法建立 %s" -#: ftparchive/multicompress.cc:303 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "和子程序/檔案 IO 失敗" -#: ftparchive/multicompress.cc:341 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "在計算 MD5 時無法讀取到資料" -#: ftparchive/multicompress.cc:357 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "在取消 %s 的連結時發生問題" -#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:46 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2098,157 +2100,157 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:122 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "無法建立管線" -#: apt-inst/contrib/extracttar.cc:149 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "無法執行 gzip" -#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "損毀的套件檔" -#: apt-inst/contrib/extracttar.cc:201 +#: apt-inst/contrib/extracttar.cc:203 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum 失敗，套件檔已損毀" -#: apt-inst/contrib/extracttar.cc:306 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 標頭類型 %u，成員 %s" -#: apt-inst/contrib/arfile.cc:74 +#: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" msgstr "無效的套件庫簽章" -#: apt-inst/contrib/arfile.cc:82 +#: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" msgstr "讀取套件檔的成員標頭訊息時發生錯誤" -#: apt-inst/contrib/arfile.cc:94 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format msgid "Invalid archive member header %s" msgstr "無效的套件檔成員標頭" -#: apt-inst/contrib/arfile.cc:106 +#: apt-inst/contrib/arfile.cc:108 msgid "Invalid archive member header" msgstr "無效的套件檔成員標頭" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:137 msgid "Archive is too short" msgstr "套件檔過短" -#: apt-inst/contrib/arfile.cc:139 +#: apt-inst/contrib/arfile.cc:141 msgid "Failed to read the archive headers" msgstr "讀取套件檔標頭失敗" -#: apt-inst/filelist.cc:382 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode 在還有連結結點時被呼叫" -#: apt-inst/filelist.cc:414 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "找不到雜湊元件！" -#: apt-inst/filelist.cc:461 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "在配置抽換資訊時失敗" -#: apt-inst/filelist.cc:466 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "在 AddDiversion 發生了內部錯誤" -#: apt-inst/filelist.cc:479 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s" -#: apt-inst/filelist.cc:508 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "重複加入抽換資訊 %s -> %s" -#: apt-inst/filelist.cc:551 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format msgid "The path %s is too long" msgstr "路徑 %s 過長" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:132 #, c-format msgid "Unpacking %s more than once" msgstr "解開 %s 超過一次" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:142 #, c-format msgid "The directory %s is diverted" msgstr "路徑 %s 已被抽換" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:152 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "此套件試圖寫至抽換後的目標 %s/%s" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 msgid "The diversion path is too long" msgstr "要進行抽換的路徑過長" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:249 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "目錄 %s 已經被非目錄的檔案所取代" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:289 msgid "Failed to locate node in its hash bucket" msgstr "在雜湊表中找不到節點" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:293 msgid "The path is too long" msgstr "路徑過長" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:421 #, c-format msgid "Overwrite package match with no version for %s" msgstr "以無版本的 %s 覆寫原始套件" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:438 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:498 #, c-format msgid "Unable to stat %s" msgstr "無法取得 %s 的狀態" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 -#: apt-inst/deb/debfile.cc:57 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員" -#: apt-inst/deb/debfile.cc:124 +#: apt-inst/deb/debfile.cc:130 #, c-format msgid "Internal error, could not locate member %s" msgstr "內部錯誤，找不找到成員 %s" -#: apt-inst/deb/debfile.cc:219 +#: apt-inst/deb/debfile.cc:225 msgid "Unparsable control file" msgstr "無法分析的 control 檔" @@ -2307,494 +2309,499 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/contrib/strutl.cc:406 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/contrib/strutl.cc:413 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/contrib/strutl.cc:1236 #, c-format msgid "Selection %s not found" msgstr "選項 %s 找不到" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "無法辨識的縮寫類型：'%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "開啟設定檔 %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:820 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "語法錯誤 %s:%u：標籤格式錯誤" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "語法錯誤 %s:%u：指令只能於最高層級執行" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "語法錯誤 %s:%u: 太多巢狀引入檔" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "語法錯誤 %s:%u：從此引入" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "語法錯誤 %s:%u：不支援的指令 '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "語法錯誤 %s:%u：指令只能於最高層級執行" -#: apt-pkg/contrib/configuration.cc:934 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 錯誤！" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" -#: apt-pkg/contrib/progress.cc:179 +#: apt-pkg/contrib/progress.cc:181 msgid "..." msgstr "" #. Print the spinner -#: apt-pkg/contrib/progress.cc:195 +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format msgid "%c%s... %u%%" msgstr "%c%s... 完成" -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/contrib/cmndline.cc:121 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "未知的命令列選項 '%c' [來自 %s]。" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format msgid "Command line option %s is not understood" msgstr "無法理解的命令列選項 %s" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:168 #, c-format msgid "Command line option %s is not boolean" msgstr "命令列選項 %s 不是 boolean 值" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 #, c-format msgid "Option %s requires an argument." msgstr "需替選項 %s 指定參數。" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "選項 %s：在指定設定項目時應該有 =<val>。" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/contrib/cmndline.cc:278 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "選項 %s 的參數應該是數字，而不是 '%s'" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/contrib/cmndline.cc:309 #, c-format msgid "Option '%s' is too long" msgstr "選項 %s 太長" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/contrib/cmndline.cc:341 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "偵測器 %s 無法理解，試試 true 或 false。" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/contrib/cmndline.cc:391 #, c-format msgid "Invalid operation %s" msgstr "無效的操作 %s" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "無法取得掛載點 %s 的狀態" -#: apt-pkg/contrib/cdromutl.cc:225 +#: apt-pkg/contrib/cdromutl.cc:246 msgid "Failed to stat the cdrom" msgstr "無法取得 CD-ROM 的狀態" -#: apt-pkg/contrib/fileutl.cc:95 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "在關閉檔案時發生問題" - -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/contrib/fileutl.cc:189 #, c-format msgid "Not using locking for read only lock file %s" msgstr "不在唯讀檔案 %s 上使用檔案鎖定" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/contrib/fileutl.cc:194 #, c-format msgid "Could not open lock file %s" msgstr "無法開啟鎖定檔 %s" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/contrib/fileutl.cc:217 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/contrib/fileutl.cc:222 #, c-format msgid "Could not get lock %s" msgstr "無法將 %s 鎖定" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/contrib/fileutl.cc:359 apt-pkg/contrib/fileutl.cc:473 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/contrib/fileutl.cc:411 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:420 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/contrib/fileutl.cc:825 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子程序 %s 傳回錯誤碼 (%u)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/contrib/fileutl.cc:831 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期得結束" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/contrib/fileutl.cc:912 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "在關閉檔案時發生問題" + +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format msgid "Could not open file %s" msgstr "無法開啟檔案 %s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/contrib/fileutl.cc:1152 apt-pkg/contrib/fileutl.cc:1199 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "無法開啟管線給 %s 使用" -#: apt-pkg/contrib/fileutl.cc:1178 +#: apt-pkg/contrib/fileutl.cc:1306 msgid "Failed to create subprocess IPC" msgstr "無法建立子程序 IPC" -#: apt-pkg/contrib/fileutl.cc:1233 +#: apt-pkg/contrib/fileutl.cc:1361 msgid "Failed to exec compressor " msgstr "無法執行壓縮程式" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/contrib/fileutl.cc:1489 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "讀取，仍有 %lu 未讀但已無空間" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/contrib/fileutl.cc:1602 apt-pkg/contrib/fileutl.cc:1624 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/contrib/fileutl.cc:1723 +#: apt-pkg/contrib/fileutl.cc:1894 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1735 +#: apt-pkg/contrib/fileutl.cc:1906 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "在同步檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1746 +#: apt-pkg/contrib/fileutl.cc:1917 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1759 +#: apt-pkg/contrib/fileutl.cc:1930 msgid "Problem syncing the file" msgstr "在同步檔案時發生問題" +#: apt-pkg/contrib/fileutl.cc:2026 apt-pkg/acquire-item.cc:148 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "無法重新命名，%s (%s -> %s)。" + #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "放棄安裝。" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "清空套件快取" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "套件快取檔損壞" -#: apt-pkg/pkgcache.cc:159 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "套件快取檔版本不符" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "套件快取檔損壞" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/pkgcache.cc:174 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本 APT 不支援 '%s' 版本系統" -#: apt-pkg/pkgcache.cc:172 +#: apt-pkg/pkgcache.cc:179 msgid "The package cache was built for a different architecture" msgstr "這個套件快取是用於另一種平台的" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "相依關係" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "預先相依關係" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "建議" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "推薦" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "衝突" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "取代" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "廢棄" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "毀損" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "必要" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "次要" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "額外" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" msgstr "正在重建相依關係" -#: apt-pkg/depcache.cc:133 +#: apt-pkg/depcache.cc:139 msgid "Candidate versions" msgstr "候選版本" -#: apt-pkg/depcache.cc:162 +#: apt-pkg/depcache.cc:168 msgid "Dependency generation" msgstr "建立相依關係" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 msgid "Reading state information" msgstr "正在讀取狀態資料" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to open StateFile %s" msgstr "無法開啟 StateFile %s" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:256 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "無法寫入暫存的 StateFile %s" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/tagfile.cc:140 #, c-format msgid "Unable to parse package file %s (1)" msgstr "無法辨識套件檔 %s (1)" -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/tagfile.cc:237 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:208 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:217 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/sourcelist.cc:224 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "正在開啟 %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format msgid "Line %u too long in source list %s." msgstr "來源列表 %2$s 中的第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/sourcelist.cc:371 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "無法開啟檔案 %s" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/packagemanager.cc:577 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2804,18 +2811,18 @@ msgstr "" "此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但" "若您執意進行，請設定 APT::Force-LoopBreak 選項。" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "不被支援的索引檔類型 '%s'" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/algorithms.cc:265 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1083 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2823,213 +2830,208 @@ msgstr "" "錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套" "件。" -#: apt-pkg/algorithms.cc:1070 +#: apt-pkg/algorithms.cc:1085 msgid "Unable to correct problems, you have held broken packages." msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "找不到清單目錄 %spartial。" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "找不到套件檔目錄 %spartial。" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "無法鎖定列表目錄" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/acquire.cc:899 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "正在取得檔案 %li/%li（還有 %s）" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/acquire.cc:901 #, c-format msgid "Retrieving file %li of %li" msgstr "正在取得檔案 %li/%li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "找不到安裝方式的驅動程式 %s。" -#: apt-pkg/acquire-worker.cc:115 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format msgid "Is the package %s installed?" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: apt-pkg/acquire-worker.cc:166 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "安裝方式 %s 沒有正確啟動" -#: apt-pkg/acquire-worker.cc:452 +#: apt-pkg/acquire-worker.cc:455 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支援的套件包裝系統 '%s'" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "無法確認合適的套件包裝系統類型" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." msgstr "無法取得 %s 的狀態。" -#: apt-pkg/srcrecords.cc:47 +#: apt-pkg/srcrecords.cc:52 msgid "You must put some 'source' URIs in your sources.list" msgstr "在 sources.list 中必須包含一些 'source' URI" -#: apt-pkg/cachefile.cc:87 +#: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "無法分析或開啟套件清單或狀況檔。" -#: apt-pkg/cachefile.cc:91 +#: apt-pkg/cachefile.cc:98 msgid "You may want to run apt-get update to correct these problems" msgstr "您也許得執行 apt-get update 以修正這些問題" -#: apt-pkg/cachefile.cc:109 +#: apt-pkg/cachefile.cc:116 msgid "The list of sources could not be read." msgstr "無法讀取來源列表。" -#: apt-pkg/policy.cc:75 +#: apt-pkg/policy.cc:83 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:414 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭" -#: apt-pkg/policy.cc:436 +#: apt-pkg/policy.cc:444 #, c-format msgid "Did not understand pin type %s" msgstr "無法分析鎖定類型 %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/policy.cc:452 msgid "No priority (or zero) specified for pin" msgstr "銷定並沒有優先順序之分（或零）" -#: apt-pkg/pkgcachegen.cc:87 +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "快取使用的是不相容的版本系統" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "在處理 %s 時發生錯誤 (FindPkg)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:263 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:266 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "在計算檔案相依性時找不到套件 %s %s" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "無法取得來源套件列表 %s 的狀態" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 msgid "Reading package lists" msgstr "正在讀取套件清單" -#: apt-pkg/pkgcachegen.cc:1304 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "正在收集檔案提供者" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "在儲存來源快取時 IO 錯誤" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "無法重新命名，%s (%s -> %s)。" - -#: apt-pkg/acquire-item.cc:154 +#: apt-pkg/acquire-item.cc:163 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:159 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "大小不符" -#: apt-pkg/acquire-item.cc:164 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "無效的操作 %s" -#: apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1579 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1586 +#: apt-pkg/acquire-item.cc:1595 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1637 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1666 +#: apt-pkg/acquire-item.cc:1675 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1688 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1718 +#: apt-pkg/acquire-item.cc:1727 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3037,12 +3039,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1856 +#: apt-pkg/acquire-item.cc:1865 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3051,100 +3053,100 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1922 +#: apt-pkg/acquire-item.cc:1931 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1980 +#: apt-pkg/acquire-item.cc:1989 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "Unable to parse Release file %s" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:86 #, c-format msgid "No sections in Release file %s" msgstr "在 Release 檔 %s 裡沒有區段" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "在 Release 檔 %s 裡沒有 Hash 項目" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "在 Release 檔 %s 裡沒有 Hash 項目" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "在 Release 檔 %s 裡沒有 Hash 項目" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "提供者區塊 %s 沒有包含指紋碼" -#: apt-pkg/cdrom.cc:575 +#: apt-pkg/cdrom.cc:577 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" -#: apt-pkg/cdrom.cc:588 +#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸載光碟機...\n" + +#: apt-pkg/cdrom.cc:592 msgid "Waiting for disc...\n" msgstr "正在等待碟片...\n" -#: apt-pkg/cdrom.cc:597 +#: apt-pkg/cdrom.cc:602 msgid "Mounting CD-ROM...\n" msgstr "正在掛載光碟機... \n" -#: apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:610 msgid "Identifying... " msgstr "正在識別..." -#: apt-pkg/cdrom.cc:643 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Stored label: %s\n" msgstr "保存標籤：%s\n" -#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸載光碟機...\n" - -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:672 msgid "Scanning disc for index files...\n" msgstr "正在掃描碟片中的索引檔...\n" -#: apt-pkg/cdrom.cc:717 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:733 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "Found label '%s'\n" msgstr "找到標籤 '%s'\n" -#: apt-pkg/cdrom.cc:784 +#: apt-pkg/cdrom.cc:789 msgid "That is not a valid name, try again.\n" msgstr "這並不是正確的名稱，請重試。\n" -#: apt-pkg/cdrom.cc:801 +#: apt-pkg/cdrom.cc:806 #, c-format msgid "" "This disc is called: \n" @@ -3153,34 +3155,34 @@ msgstr "" "這個碟片名為：\n" "'%s'\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:808 msgid "Copying package lists..." msgstr "正在複製套件清單..." -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:843 msgid "Writing new source list\n" msgstr "正在寫入新的來源列表\n" -#: apt-pkg/cdrom.cc:846 +#: apt-pkg/cdrom.cc:851 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n" @@ -3195,255 +3197,255 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" -#: apt-pkg/cacheset.cc:479 +#: apt-pkg/cacheset.cc:487 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "找不到 '%2$s' 的 '%1$s' 發行版" -#: apt-pkg/cacheset.cc:482 +#: apt-pkg/cacheset.cc:490 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "找不到 '%s' 版的 '%s'" -#: apt-pkg/cacheset.cc:593 +#: apt-pkg/cacheset.cc:601 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "無法找到主題 %s" -#: apt-pkg/cacheset.cc:599 +#: apt-pkg/cacheset.cc:607 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "無法找到套件 %s" -#: apt-pkg/cacheset.cc:605 +#: apt-pkg/cacheset.cc:613 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "無法找到套件 %s" -#: apt-pkg/cacheset.cc:616 +#: apt-pkg/cacheset.cc:624 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 +#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:645 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:653 +#: apt-pkg/cacheset.cc:661 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:209 +#: apt-pkg/edsp.cc:216 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:279 +#: apt-pkg/edsp.cc:286 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:293 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 msgid "Execute external solver" msgstr "" -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。" -#: apt-pkg/deb/dpkgpm.cc:91 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Installing %s" msgstr "正在安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Configuring %s" msgstr "正在設定 %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Removing %s" msgstr "正在移除 %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: apt-pkg/deb/dpkgpm.cc:98 #, fuzzy, c-format msgid "Completely removing %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: apt-pkg/deb/dpkgpm.cc:99 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 +#: apt-pkg/deb/dpkgpm.cc:100 #, c-format msgid "Running post-installation trigger %s" msgstr "正在執行安裝後套件後續處理程式 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: apt-pkg/deb/dpkgpm.cc:812 #, c-format msgid "Directory '%s' missing" msgstr "找不到 '%s' 目錄" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: apt-pkg/deb/dpkgpm.cc:827 apt-pkg/deb/dpkgpm.cc:849 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "無法開啟檔案 %s" -#: apt-pkg/deb/dpkgpm.cc:970 +#: apt-pkg/deb/dpkgpm.cc:974 #, c-format msgid "Preparing %s" msgstr "正在準備 %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Unpacking %s" msgstr "正在解開 %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:980 #, c-format msgid "Preparing to configure %s" msgstr "正在準備設定 %s" -#: apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Installed %s" msgstr "已安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:987 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備移除 %s" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removed %s" msgstr "已移除 %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:994 #, c-format msgid "Preparing to completely remove %s" msgstr "正在準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Completely removed %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:1046 +#: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "無法寫入 %s" -#: apt-pkg/deb/dpkgpm.cc:1049 +#: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1558 +#: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1620 +#: apt-pkg/deb/dpkgpm.cc:1624 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 +#: apt-pkg/deb/dpkgpm.cc:1629 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1627 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/deb/dpkgpm.cc:1637 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1640 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1674 +#: apt-pkg/deb/dpkgpm.cc:1678 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/deb/debsystem.cc:91 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "無法鎖定列表目錄" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/deb/debsystem.cc:110 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:121 +#: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "" -- cgit v1.2.3 From 574d8d43f755019c7223fe128b22b27fd836017d Mon Sep 17 00:00:00 2001 From: Chris Leick <c.leick@vollbio.de> Date: Sat, 15 Mar 2014 13:04:15 +0100 Subject: Updated German doc translation --- doc/po/de.po | 112 +++++++++++++++-------------------------------------------- 1 file changed, 28 insertions(+), 84 deletions(-) diff --git a/doc/po/de.po b/doc/po/de.po index 6d9189fc9..590545d31 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.14.2\n" +"Project-Id-Version: apt-doc 0.9.16\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2014-03-14 09:13+0100\n" -"PO-Revision-Date: 2014-01-26 15:26+0100\n" +"PO-Revision-Date: 2014-03-15 12:26+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -643,12 +643,6 @@ 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 " @@ -658,7 +652,7 @@ msgstr "" "<command>apt-get</command> ist ein Befehlszeilenwerkzeug zur Handhabung von " "Paketen und könnte als »Backend« anderer Werkzeugen betrachtet werden, die " "die APT-Bibliothek benutzen. Es existieren mehrere " -"Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;." +"Oberflächenschnittstellen, wie &aptitude;, &synaptic; und &wajig;." #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46 @@ -984,7 +978,7 @@ msgid "" "option> option instead." msgstr "" "<literal>build-dep</literal> veranlasst apt-get, Pakete zu installieren/" -"entfernen, um zu versuchen, die Bau-Abhängigkeiten eines Quellpakets zu " +"entfernen, um zu versuchen, die Bauabhängigkeiten eines Quellpakets zu " "erfüllen. Standardmäßig werden die Abhängigkeiten erfüllt, um das Paket auf " "native Art zu bauen. Falls gewünscht, kann stattdessen eine " "Rechnerarchitektur mit der Option <option>--host-architecture</option> " @@ -1010,15 +1004,6 @@ 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 " @@ -1028,10 +1013,7 @@ msgstr "" "<literal>clean</literal> bereinigt das lokale Depot von heruntergeladenen " "Paketdateien. Es entfernt alles außer der Sperrdatei aus " "<filename>&cachedir;/archives/</filename> und <filename>&cachedir;/archives/" -"partial/</filename>. Wenn APT als eine &dselect;-Methode benutzt wird, wird " -"<literal>clean</literal> automatisch ausgeführt. Diejenigen, die Dselect " -"nicht benutzen, werden <literal>apt-get clean</literal> wahrscheinlich von " -"Zeit zu Zeit ausführen, um Plattenplatz freizugeben." +"partial/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:224 @@ -1124,19 +1106,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: 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 " @@ -1158,11 +1127,11 @@ msgstr "" "Mal ausgeführt wird. APT selbst erlaubt es nicht, dass auf einen System " "beschädigte Paketabhängigkeiten existieren. Es ist möglich, dass eine " "Abhängigkeitsstruktur eines Systems so fehlerhaft ist, dass ein manuelles " -"Eingreifen erforderlich ist (was normalerweise bedeutet, dass &dselect; oder " -"<command>dpkg --remove</command> benutzt wird, um einige der fehlerhaften " -"Pakete zu beseitigen). Wenn Sie die Option zusammen mit <option>-m</option> " -"benutzen, könnte das in einigen Situationen zu Fehlern führen. " -"Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>." +"Eingreifen erforderlich ist (was normalerweise bedeutet, dass <command>dpkg " +"--remove</command> benutzt wird, um einige der fehlerhaften Pakete zu " +"beseitigen). Wenn Sie die Option zusammen mit <option>-m</option> benutzen, " +"könnte das in einigen Situationen zu Fehlern führen. Konfigurationselement: " +"<literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:292 @@ -1310,14 +1279,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 -#, fuzzy -#| msgid "" -#| "This option controls the architecture packages are built for by " -#| "<command>apt-get source --compile</command> and how cross-" -#| "builddependencies are satisfied. By default is it not set which means " -#| "that the host architecture is the same as the build architecture (which " -#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " -#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1327,22 +1288,14 @@ msgid "" "Architecture</literal>." msgstr "" "Diese Option steuert, wie die Architekturpakete durch <command>apt-get " -"source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten erfüllt " +"source --compile</command> gebaut und wie Cross-Bauabhängigkeiten erfüllt " "werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass die " -"Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch " +"Rechnerarchitektur die gleiche wie die Bauarchitektur ist (die durch " "<literal>APT::Architecture</literal>) definiert wird). " -"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>" +"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 -#, fuzzy -#| msgid "" -#| "This option controls the architecture packages are built for by " -#| "<command>apt-get source --compile</command> and how cross-" -#| "builddependencies are satisfied. By default is it not set which means " -#| "that the host architecture is the same as the build architecture (which " -#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: " -#| "<literal>APT::Get::Host-Architecture</literal>" msgid "" "This option controls the activated build profiles for which a source package " "is built by <command>apt-get source --compile</command> and how build " @@ -1350,12 +1303,12 @@ msgid "" "than one build profile can be activated at a time by concatenating them with " "a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." msgstr "" -"Diese Option steuert, wie die Architekturpakete durch <command>apt-get " -"source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten erfüllt " -"werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass die " -"Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch " -"<literal>APT::Architecture</literal>) definiert wird). " -"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>" +"Diese Option steuert die aktivierten Bauprofile für die ein Quellpaket durch " +"<command>apt-get source --compile</command> gebaut und wie " +"Cross-Bauabhängigkeiten erfüllt werden. Standardmäßig ist kein Bauprofil " +"aktiv. Ein weiteres Bauprofil kann gleichzeitig aktiviert werden, indem es " +"durch ein Komma getrennt angehängt wird. Konfigurationselement: " +"<literal>APT::Build-Profiles</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:391 @@ -1652,19 +1605,14 @@ msgstr "Siehe auch" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:559 -#, 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;, &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." +"&apt-cache;, &apt-cdrom;, &dpkg;, &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:564 apt-cache.8.xml:357 apt-mark.8.xml:137 @@ -3543,6 +3491,11 @@ msgid "" "is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" "buildpackage; overrides the list notation." msgstr "" +"Liste aller Bauprofile ohne das Namensraum-Präfix " +"»<literal>profile.</literal>«, die für die Auflösung der Bauabhängigkeiten " +"aktiviert sind. Standardmäßig ist diese Liste leer. " +"<envar>DEB_BUILD_PROFILES</envar> setzt so, wie es durch &dpkg-buildpackage; " +"benutzt wird, die Listenschreibweise außer Kraft." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:190 @@ -8810,15 +8763,6 @@ msgstr "" #. type: <p></p> #: guide.sgml:163 -#, fuzzy -#| msgid "" -#| "<prgn>apt-get</prgn> has several command line options that are detailed " -#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " -#| "option is <tt>-d</tt> which does not install the fetched files. If the " -#| "system has to download a large number of package it would be undesired to " -#| "start installing them in case something goes wrong. When <tt>-d</tt> is " -#| "used the downloaded archives can be installed by simply running the " -#| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " "its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " @@ -8829,7 +8773,7 @@ msgid "" "caused them to be downloaded again without <tt>-d</tt>." msgstr "" "<prgn>apt-get</prgn> hat mehrere Befehlszeilenoptionen, die sich detailliert " -"in dessen Handbuchseite, <manref section=\"8\" name=\"apt-get\"> finden. Die " +"in dessen Handbuchseite, <manref name=\"apt-get\" section=\"8\"> finden. Die " "nützlichste Option ist <tt>-d</tt>, die die heruntergeladenen Dateien nicht " "installiert. Falls das System eine große Anzahl Pakete herunterladen soll, " "würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet " -- cgit v1.2.3 From f6ffe501d432d1299808ae307936877cf2c5f8ce Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Sat, 15 Mar 2014 17:59:47 +0100 Subject: Fix handling of autoclosing for compressed files (Closes: #741685) AutoClose is both an argument in OpenDescriptor() and an enum. In commit 84baaae93badc2da7c1f4f356456762895cef278 code using the AutoClose parameter was moved to OpenDescriptorInternal(). In that function, AutoClose meant the enum value, so the check was always false. --- apt-pkg/contrib/fileutl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 1eabf37f4..ba79720d8 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1191,7 +1191,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C d->openmode = Mode; d->compressor = compressor; #if defined HAVE_ZLIB || defined HAVE_BZ2 || defined HAVE_LZMA - if (AutoClose == false && compress_open != NULL) + if ((Flags & AutoClose) != AutoClose && compress_open != NULL) { // Need to duplicate fd here or gz/bz2 close for cleanup will close the fd as well int const internFd = dup(iFd); -- cgit v1.2.3 From 384c9b0d4f69aac57da8298c4252499d1f7a83ca Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Sat, 15 Mar 2014 18:12:54 +0100 Subject: Release 0.9.16.1 --- configure.ac | 2 +- debian/changelog | 10 ++++++++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 ++-- po/ar.po | 2 +- po/ast.po | 2 +- po/bg.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/dz.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/km.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sv.po | 2 +- po/th.po | 2 +- po/tl.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 47 files changed, 57 insertions(+), 47 deletions(-) diff --git a/configure.ac b/configure.ac index b161d31be..890dadf77 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.16~20140314" +PACKAGE_VERSION="0.9.16.1" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 03a99f38d..41cca4e59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (0.9.16.1) unstable; urgency=medium + + [ Chris Leick ] + * Updated German doc translation + + [ Julian Andres Klode ] + * Fix handling of autoclosing for compressed files (Closes: #741685) + + -- Julian Andres Klode <jak@debian.org> Sat, 15 Mar 2014 18:05:25 +0100 + apt (0.9.16) unstable; urgency=medium [ Michael Vogt ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index fdc63ab1a..1d98362c1 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.16~20140314"> +<!ENTITY apt-product-version "0.9.16.1"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 2067216e9..63d29221c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.15.5\n" +"Project-Id-Version: apt-doc 0.9.16.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/po/ar.po b/po/ar.po index 1f8759b0d..45eebe389 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/ast.po b/po/ast.po index 977985205..c9261a20c 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/bg.po b/po/bg.po index 2f1318a55..0194550f7 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/bs.po b/po/bs.po index c45c578dd..d612a7fcd 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/ca.po b/po/ca.po index c9c50ff60..9fe4524f0 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/cs.po b/po/cs.po index 9e49d1058..92c325e46 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/cy.po b/po/cy.po index ae663b74c..fe1458709 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/da.po b/po/da.po index a450013dc..5cd8f6c2f 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/de.po b/po/de.po index 5173b68cf..686f80cdc 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/dz.po b/po/dz.po index d17a8764f..146732d6c 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/el.po b/po/el.po index 2124388bc..115c55c81 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/es.po b/po/es.po index 848301ee8..bab423cd6 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/eu.po b/po/eu.po index 5a812f8b2..603341e31 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/fi.po b/po/fi.po index b0315c754..05cbce44e 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/fr.po b/po/fr.po index 6ce872047..0b2034d38 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/gl.po b/po/gl.po index 4a18059f1..829174a1f 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/hu.po b/po/hu.po index 42fa2c9e3..0096dc6a1 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/it.po b/po/it.po index 565350928..889898760 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/ja.po b/po/ja.po index 5f8baad64..eda615688 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/km.po b/po/km.po index bd43f3971..b3f3482f3 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/ko.po b/po/ko.po index be87181c2..a3ee6f7a7 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/ku.po b/po/ku.po index c39eea170..310c40088 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/lt.po b/po/lt.po index b1bf64a8f..a62dbdf92 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/mr.po b/po/mr.po index 640dbdd15..1212fcfd5 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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 " diff --git a/po/nb.po b/po/nb.po index 118f57dd3..0397133db 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/ne.po b/po/ne.po index ac7107726..e109dac77 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/nl.po b/po/nl.po index 613a6ac6c..2c14bec87 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/nn.po b/po/nn.po index d66a4e1a2..270bc570c 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/pl.po b/po/pl.po index b9c22bad7..ec5beefd1 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/pt.po b/po/pt.po index 2771d44ea..5a1d446a0 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/pt_BR.po b/po/pt_BR.po index a16be868a..f3abbf512 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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." diff --git a/po/ro.po b/po/ro.po index 1504ec4a3..d86fa3a99 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/ru.po b/po/ru.po index 930eb03fe..387b2a926 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/sk.po b/po/sk.po index 9dd96041c..f91460d72 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/sl.po b/po/sl.po index 14b7c53c9..a67107a34 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/sv.po b/po/sv.po index 3cb891ddd..45fe626f2 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/th.po b/po/th.po index b6415125a..d928fd2a1 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/tl.po b/po/tl.po index dbd69f19f..cc8bd7bd2 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/tr.po b/po/tr.po index 22837bac3..e9cc1fcd9 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/uk.po b/po/uk.po index 0d9c44873..b72a1fd26 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/vi.po b/po/vi.po index 42fe3efe6..464d237a4 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.15.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+0100\n" "PO-Revision-Date: 2014-03-03 15:40+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4ee8099bb..671f4453f 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5199b3f99..53ea6b521 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-03-14 09:13+0100\n" +"POT-Creation-Date: 2014-03-15 18:13+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." -- cgit v1.2.3 From b68ce88357daf362e60d7f8f131041289c8db690 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Mon, 17 Mar 2014 13:43:12 +0100 Subject: apt-inst: Do not try to create a substring of an empty string in error reporting One of our compressors (the empty one) has an empty extension. Calling substr on it fails. --- apt-inst/deb/debfile.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 3803329fa..a63cb6716 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -124,8 +124,10 @@ bool debDebFile::ExtractTarMember(pkgDirStream &Stream,const char *Name) { std::string ext = std::string(Name) + ".{"; for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); - c != compressor.end(); ++c) - ext.append(c->Extension.substr(1)); + c != compressor.end(); ++c) { + if (!c->Extension.empty()) + ext.append(c->Extension.substr(1)); + } ext.append("}"); return _error->Error(_("Internal error, could not locate member %s"), ext.c_str()); } -- cgit v1.2.3 From c4b113e650dbdbb4c5c9c6f36437c94db6b214d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Fri, 21 Mar 2014 11:04:26 +0100 Subject: continue reading in xz even if it outputs nothing It can happen that content in our buffer is not enough to produce a meaningful output in which case no output is created by liblzma, but still reports that everything is okay and we should go on. The code assumes it has reached the end through if it encounters a null read, so this commit makes it so that it looks like this read was interrupted just like the lowlevel read() on uncompressed files could. It subsequently fixes the issue with that as well as until now our loop would still break even if we wanted it to continue on. (This bug triggers our usual "Hash sum mismatch" error) Reported-By: Stefan Lippers-Hollmann <s.L-H@gmx.de> --- apt-pkg/contrib/fileutl.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index ba79720d8..69406a9bf 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1430,7 +1430,15 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) errno = 0; } else + { Res = Size - d->lzma->stream.avail_out; + if (Res == 0) + { + // lzma run was okay, but produced no output… + Res = -1; + errno = EINTR; + } + } } #endif else @@ -1439,7 +1447,12 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) if (Res < 0) { if (errno == EINTR) + { + // trick the while-loop into running again + Res = 1; + errno = 0; continue; + } if (false) /* dummy so that the rest can be 'else if's */; #ifdef HAVE_ZLIB -- cgit v1.2.3 From a17482f89b636a52aacc57776bfc8041cf4da508 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Fri, 21 Mar 2014 11:47:56 +0100 Subject: only consider versioned kernel packages in autoremove Metapackages like "linux-image-amd64" are otherwise matched by our extraction as well, which later on can't be successfully compared via dpkg --compare-versions as the 'amd64' bit isn't a version number. (Luckily none of our architectures starts with a digit.) This was broken by me in 0.9.16 as I moved a shell-glob matcher to a regex-based one which has slightly different semantics regarding '*'. Closes: 741962 --- debian/apt.auto-removal.sh | 2 +- test/integration/test-kernel-helper-autoremove | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 0c5158658..c00416127 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -41,7 +41,7 @@ version_test_gt () return "$?" } -list="$(${DPKG} -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]*/ && $2 !~ /-dbg$/ { print $2 }' | sed -e 's#\(linux\|kfreebsd\|gnumach\)-image-##')" +list="$(${DPKG} -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]/ && $2 !~ /-dbg$/ { print $2 }' | sed -e 's#\(linux\|kfreebsd\|gnumach\)-image-##')" latest_version="" previous_version="" diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index 7713c0875..c51caa758 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -20,6 +20,7 @@ CURRENTKERNEL="linux-image-$(uname -r)" insertinstalledpackage "$CURRENTKERNEL" 'amd64' '1' insertinstalledpackage 'linux-image-1.0.0-2-generic' 'amd64' '1.0.0-2' insertinstalledpackage 'linux-image-100.0.0-1-generic' 'amd64' '100.0.0-1' +insertinstalledpackage 'linux-image-amd64' 'amd64' '100.0.0-1' # ensure that the '.' is really a dot and not a wildcard insertinstalledpackage 'linux-headers-1000000-1-generic' 'amd64' '100.0.0-1' -- cgit v1.2.3 From e1ed0993c712183df4ffc6272947f5aac58eb59b Mon Sep 17 00:00:00 2001 From: Beatrice Torracca <beatricet@libero.it> Date: Fri, 21 Mar 2014 12:03:34 +0100 Subject: Italian manpages translation update Closes: 741867 --- doc/po/it.po | 223 +++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 131 insertions(+), 92 deletions(-) diff --git a/doc/po/it.po b/doc/po/it.po index dc74eb25e..3a54e10c9 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -5,14 +5,13 @@ # Eugenia Franzoni, 2000 # Hugh Hartmann, 2000-2012 # Gabriele Stilli, 2012 -# Beatrice Torracca, 2012 -# Beatrice Torracca <beatricet@libero.it>, 2012. +# Beatrice Torracca <beatricet@libero.it>, 2012, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-03-14 09:13+0100\n" -"PO-Revision-Date: 2012-12-23 18:04+0200\n" +"POT-Creation-Date: 2014-03-14 09:57+0100\n" +"PO-Revision-Date: 2014-03-15 23:29+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" "Language: it\n" @@ -692,7 +691,6 @@ 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 " @@ -707,7 +705,7 @@ msgstr "" "<command>apt-get</command> è lo strumento a riga di comando per gestire " "pacchetti e può essere considerato il «backend» dell'utente per altri " "strumenti che usano la libreria APT. Esistono diversi «frontend» per " -"interfaccia, come &dselect;, &aptitude;, &synaptic; e &wajig;." +"interfaccia, come &aptitude;, &synaptic; e &wajig;." #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46 @@ -1056,7 +1054,6 @@ 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 " @@ -1072,12 +1069,9 @@ msgid "" "partial/</filename>." msgstr "" "<literal>clean</literal> ripulisce il repository locale dei file di " -"pacchetto recuperati. Rimuove tutto da <filename>&cachedir;/archives/</" -"filename> e <filename>&cachedir;/archives/partial/</filename>, tranne il " -"file di lock. Quando APT viene usato come metodo per &dselect;, " -"<literal>clean</literal> viene eseguito automaticamente. Chi non usa dselect " -"probabilmente è bene che usi <literal>apt-get clean</literal> di quando in " -"quando per liberare spazio su disco." +"pacchetto recuperati. Rimuove tutto da " +"<filename>&cachedir;/archives/</filename> e " +"<filename>&cachedir;/archives/partial/</filename>, tranne il file di lock." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:224 @@ -1170,7 +1164,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: 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 " @@ -1204,10 +1197,10 @@ msgstr "" "volta; APT stesso non permette l'esistenza di pacchetti con dipendenze non " "soddisfatte in un sistema. È possibile che la struttura di dipendenze di un " "sistema sia corrotta a tal punto da richiedere un intervento manuale (il che " -"di solito significa usare &dselect; o <command>dpkg --remove</command> per " -"eliminare alcuni dei pacchetti che creano problemi). L'uso di questa opzione " -"insieme a <option>-m</option> può in alcune situazioni produrre un errore. " -"Voce di configurazione: <literal>APT::Get::Fix-Broken</literal>." +"di solito significa usare <command>dpkg --remove</command> per eliminare " +"alcuni dei pacchetti che creano problemi). L'uso di questa opzione insieme a " +"<option>-m</option> può in alcune situazioni produrre un errore. Voce di " +"configurazione: <literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:292 @@ -1353,7 +1346,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:370 -#, fuzzy #| msgid "" #| "This option controls the architecture packages are built for by " #| "<command>apt-get source --compile</command> and how cross-" @@ -1378,7 +1370,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:380 -#, fuzzy #| msgid "" #| "This option controls the architecture packages are built for by " #| "<command>apt-get source --compile</command> and how cross-" @@ -1393,12 +1384,12 @@ msgid "" "than one build profile can be activated at a time by concatenating them with " "a comma. Configuration Item: <literal>APT::Build-Profiles</literal>." msgstr "" -"Questa opzione controlla l'architettura per la quale <command>apt-get source " -"--compile</command> compila i pacchetti e come le dipendenze di compilazione " -"incrociata sono soddisfatte. In modo predefinito non è impostata, il che " -"significa che l'architettura ospite è la stessa dell'architettura di " -"compilazione (che è definita da <literal>APT::Architecture</literal>). Voce " -"di configurazione: <literal>APT::Get::Host-Architecture</literal>." +"Questa opzione controlla i profili di compilazione attivi per i quali " +"<command>apt-get source --compile</command> compila un pacchetto sorgente e " +"come le dipendenze di compilazione sono soddisfatte. In modo predefinito non " +"è attivo alcun profilo di compilazione. Più profili di compilazione possono " +"essere attivati contemporaneamente concatenandoli con una virgola. Voce di " +"configurazione: <literal>APT::Build-Profiles</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:391 @@ -1433,6 +1424,13 @@ msgid "" "will never remove packages, only allow adding new ones. Configuration Item: " "<literal>APT::Get::Upgrade-Allow-New</literal>." msgstr "" +"Permette l'installazione di nuovi pacchetti quando usato insieme a " +"<literal>upgrade</literal>. Ciò è utile se l'aggiornamento di un pacchetto " +"installato richiede l'installazione di nuove dipendenze. Invece di bloccare " +"il pacchetto <literal>upgrade</literal> aggiornerà il pacchetto e installerà " +"le nuove dipendenze. Notare che <literal>upgrade</literal> con questa " +"opzione non rimuoverà mai pacchetti, permetterà solo l'aggiunta di nuovi. " +"Voce di configurazione: <literal>APT::Get::Upgrade-Allow-New</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:415 @@ -1658,6 +1656,12 @@ msgid "" "Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</" "literal>." msgstr "" +"Mostra informazioni sul progresso facili da leggere nella finestra del " +"terminale quando i pacchetti sono installati, aggiornati o rimossi. Per una " +"versione analizzabile da macchina di questi dati, vedere README.progress-" +"reporting nella directory della documentazione di apt. Voce di " +"configurazione: <literal>DpkgPM::Progress</literal> e <literal>Dpkg" +"::Progress-Fancy</literal>." #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 @@ -1676,7 +1680,6 @@ msgstr "Vedere anche" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:559 -#, fuzzy #| msgid "" #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " #| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -1686,9 +1689,9 @@ msgid "" "&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." +"&apt-cache;, &apt-cdrom;, &dpkg;, &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:564 apt-cache.8.xml:357 apt-mark.8.xml:137 @@ -2993,7 +2996,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:87 -#, fuzzy #| msgid "" #| "Mount point; specify the location to mount the CD-ROM. This mount point " #| "must be listed in <filename>/etc/fstab</filename> and properly " @@ -3003,10 +3005,9 @@ msgid "" "<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" "cdrom::AutoDetect</literal>." msgstr "" -"Punto di mount; specifica la posizione in cui montare il CD-ROM. Questo " -"punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> " -"e configurato correttamente. Voce di configurazione: <literal>Acquire::" -"cdrom::mount</literal>." +"Non cercare di rilevare automaticamente il percorso del CD-ROM. Solitamente " +"usato insieme all'opzione <option>--cdrom</option>. Voce di configurazione: " +"<literal>Acquire::cdrom::AutoDetect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:95 @@ -3558,6 +3559,11 @@ msgid "" "is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-" "buildpackage; overrides the list notation." msgstr "" +"Elenco dei profili di compilazione abilitati per la risoluzione delle " +"dipendenze di compilazione, senza il prefisso dello spazio dei nomi " +"«<literal>profile.</literal>». In modo predefinito questa lista è vuota. " +"<envar>DEB_BUILD_PROFILES</envar>, come usata da &dpkg-buildpackage; ha la " +"precedenza sulla notazione della lista." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:190 @@ -3987,7 +3993,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:400 -#, fuzzy #| msgid "" #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" #| "literal> which accepts integer values in kilobytes. The default value is " @@ -4001,11 +4006,11 @@ msgid "" "bandwidth. Note that this option implicitly disables downloading from " "multiple servers at the same time." msgstr "" -"La quantità di banda utilizzata può essere limitata con <literal>Acquire::" -"http::Dl-Limit</literal> che accetta valori interi in kilobyte. Il valore " -"predefinito è 0 che disattiva il limite e cerca di usare tutta la banda " -"disponibile (notare che questa opzione implicitamente disabilita lo " -"scaricamento da più server contemporaneamente)." +"La quantità di banda utilizzata può essere limitata con " +"<literal>Acquire::http::Dl-Limit</literal> che accetta valori interi in " +"kilobyte al secondo. Il valore predefinito è 0 che disattiva il limite e " +"cerca di usare tutta la banda disponibile. Notare che questa opzione " +"implicitamente disabilita lo scaricamento da più server contemporaneamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:407 @@ -4032,6 +4037,16 @@ msgid "" "takes precedence over the legacy option name <literal>ProxyAutoDetect</" "literal>." msgstr "" +"<literal>Acquire::http::Proxy-Auto-Detect</literal> può essere usato per " +"specificare un comando esterno per rilevare il proxy http da usare. Apt si " +"aspetta che il comando produca in output il proxy sullo stdout nello stile " +"<literal>http://proxy:porta/</literal>. Questo avrà la precedenza sul " +"generico <literal>Acquire::http::Proxy</literal>, ma non su qualsiasi " +"configurazione specifica di host proxy impostata con " +"<literal>Acquire::http::Proxy::$HOST</literal>. Vedere il pacchetto &squid-" +"deb-proxy-client; per un esempio di implementazione che usa avahi. Questa " +"opzione ha la precedenza sull'opzione col nome obsoleto " +"<literal>ProxyAutoDetect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:429 @@ -4415,12 +4430,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:585 msgid "When downloading, force to use only the IPv4 protocol." -msgstr "" +msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv4." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:591 msgid "When downloading, force to use only the IPv6 protocol." -msgstr "" +msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv6." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:598 @@ -4659,7 +4674,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:712 -#, fuzzy #| msgid "" #| "This is a list of shell commands to run before invoking &dpkg;. Like " #| "<literal>options</literal> this must be specified in list notation. The " @@ -4676,14 +4690,14 @@ msgid "" msgstr "" "Questa è una lista di comandi di shell da eseguire prima di invocare &dpkg;. " "Come <literal>options</literal> deve essere specificata con la notazione per " -"le liste. I comandi sono invocati in ordine usando <filename>/bin/sh</" -"filename>; se qualcuno dei comandi fallisce APT terminerà annullando. APT " -"passa i nomi di file di tutti i file .deb che sta per installare ai comandi, " -"uno per riga, sullo standard input." +"le liste. I comandi sono invocati in ordine usando " +"<filename>/bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà " +"annullando. APT passa i nomi di file di tutti i file .deb che sta per " +"installare ai comandi, uno per riga sul descrittore di file richiesto, " +"usando in modo predefinito lo standard input." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:719 -#, fuzzy #| msgid "" #| "Version 2 of this protocol dumps more information, including the protocol " #| "version, the APT configuration space and the packages, files and versions " @@ -4698,10 +4712,9 @@ msgid "" msgstr "" "La versione 2 di questo protocollo fa il dump di più informazioni, inclusi " "la versione del protocollo, lo spazio di configurazione di APT, e i " -"pacchetti, file e versioni che vengono modificati. La versione 2 viene " -"abilitata impostando <literal>DPkg::Tools::options::cmd::Version</literal> a " -"2. <literal>cmd</literal> è un comando passato a <literal>Pre-Install-Pkgs</" -"literal>." +"pacchetti, file e versioni che vengono modificati. La versione 3 aggiunge " +"l'architettura e il contrassegno <literal>MultiArch</literal> per ciascuna " +"versione di cui viene fatto il dump." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:724 @@ -4713,6 +4726,12 @@ msgid "" "the requested version it will send the information in the highest version it " "has support for instead." msgstr "" +"La versione del protocollo da usare per il comando " +"<literal><replaceable>cmd</replaceable></literal> può essere scelta " +"impostando in modo appropriato <literal>DPkg::Tools::options::<replaceable>cm" +"d</replaceable>::Version</literal>, il cui valore predefinito è la versione " +"1. Se APT non supporta la versione richiesta invierà invece l'informazione " +"nella versione più alta per cui ha il supporto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:731 @@ -4724,6 +4743,13 @@ msgid "" "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which " "contains the number of the used file descriptor as a confirmation." msgstr "" +"Il descrittore di file da usare per inviare le informazioni può essere " +"richiesto con <literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::" +"InfoFD</literal> che è in modo predefinito <literal>0</literal> per lo " +"standard input ed è disponibile a partire dalla versione 0.9.11. Il supporto " +"per l'opzione può essere controllato guardando la variabile d'ambiente " +"<envar>APT_HOOK_INFO_FD</envar> che contiene il numero del descrittore di " +"file usato per conferma." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:741 @@ -6784,10 +6810,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:82 -#, fuzzy, no-wrap +#, no-wrap #| msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgid "deb [ options ] uri suite [component1] [component2] [...]" -msgstr "deb [ opzioni ] uri distribuzione [componente1] [componente2] [...]" +msgstr "deb [ opzioni ] uri suite [componente1] [componente2] [...]" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml:86 @@ -6811,6 +6837,23 @@ msgid "" " [option1]: [option1-value]\n" " " msgstr "" +" Types: deb deb-src\n" +" URIs: http://example.com\n" +" Suites: stable testing\n" +" Sections: componente1 componente2\n" +" Description: breve\n" +" lunga lunga lunga\n" +" [opzione1]: [valore-opzione1]\n" +"\n" +" Types: deb\n" +" URIs: http://another.example.com\n" +" Suites: experimental\n" +" Sections: componente1 componente2\n" +" Enabled: no\n" +" Description:breve\n" +" lunga lunga lunga\n" +" [opzione1]: [valore-opzione1]\n" +" " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:84 @@ -6818,10 +6861,11 @@ msgid "" "Alternatively a rfc822 style format is also supported: <placeholder type=" "\"literallayout\" id=\"0\"/>" msgstr "" +"In alternativa è gestito anche un formato in stile rfc822: <placeholder type=" +"\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:105 -#, fuzzy #| msgid "" #| "The URI for the <literal>deb</literal> type must specify the base of the " #| "Debian distribution, from which APT will find the information it needs. " @@ -6842,18 +6886,16 @@ msgid "" "<literal>component</literal> must be present." msgstr "" "L'URI per il tipo <literal>deb</literal> deve specificare la base della " -"distribuzione Debian, dalla quale APT troverà le informazioni necessarie. " -"<literal>distribuzione</literal> può specificare un percorso esatto, nel " -"qual caso le componenti devono essere omesse e <literal>distribuzione</" -"literal> deve terminare con una sbarra (<literal>/</literal>). Questo è " -"utile nel caso in cui si è interessati solo a una particolare sottosezione " -"dell'archivio indicata dall'URI. Se <literal>distribuzione</literal> non " -"specifica un percorso esatto, deve essere presente almeno una " -"<literal>componente</literal>." +"distribuzione Debian, dalla quale APT troverà le informazioni di cui ha " +"bisogno. <literal>suite</literal> può specificare un percorso esatto, nel " +"qual caso le componenti devono essere omesse e <literal>suite</literal> deve " +"terminare con una sbarra (<literal>/</literal>). Questo è utile nel caso in " +"cui si è interessati solo a una particolare sottosezione dell'archivio " +"indicata dall'URI. Se <literal>suite</literal> non specifica un percorso " +"esatto, deve essere presente almeno una <literal>componente</literal>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:114 -#, fuzzy #| msgid "" #| "<literal>distribution</literal> may also contain a variable, <literal>" #| "$(ARCH)</literal> which expands to the Debian architecture (such as " @@ -6871,8 +6913,8 @@ msgid "" "<literal>APT</literal> will automatically generate a URI with the current " "architecture otherwise." msgstr "" -"<literal>distribuzione</literal> può anche contenere una variabile <literal>" -"$(ARCH)</literal> che viene espansa nell'architettura Debian (come " +"<literal>suite</literal> può anche contenere una variabile " +"<literal>$(ARCH)</literal> che viene espansa nell'architettura Debian (come " "<literal>amd64</literal> o <literal>armel</literal>) usata nel sistema. Ciò " "consente di utilizzare file <filename>sources.list</filename> indipendenti " "dall'architettura. In generale questo è interessante solo quando viene " @@ -6881,7 +6923,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 -#, fuzzy #| msgid "" #| "Since only one distribution can be specified per line it may be necessary " #| "to have multiple lines for the same URI, if a subset of all available " @@ -6907,17 +6948,18 @@ msgid "" "users. APT also parallelizes connections to different hosts to more " "effectively deal with sites with low bandwidth." msgstr "" -"Dato che può essere specificata solo una distribuzione per riga, può essere " -"necessario avere più righe per lo stesso URI, se si desidera un sottoinsieme " -"di tutte le distribuzioni o componenti disponibili in quella posizione. APT " -"ordinerà la lista degli URI dopo aver generato internamente un insieme " -"completo, e riunirà i riferimenti multipli, per esempio al medesimo host " -"Internet in una singola connessione; in questo modo non stabilisce in modo " -"inefficiente una connessione FTP per poi chiuderla, fare qualcos'altro e " -"quindi ristabilire una connessione con il medesimo host. Questa funzionalità " -"è utile per accedere a siti FTP molto impegnati con un limite al numero di " -"accessi anonimi contemporanei. APT inoltre parallelizza le connessioni a " -"host differenti, per gestire in maniera più efficiente i siti con scarsa " +"Dato che, nel formato di sources.list in stile tradizionale, può essere " +"specificata solo una distribuzione per riga, può essere necessario avere più " +"righe per lo stesso URI, se si desidera un sottoinsieme di tutte le " +"distribuzioni o componenti disponibili in quella posizione. APT ordinerà la " +"lista degli URI dopo aver generato internamente un insieme completo, e " +"riunirà i riferimenti multipli, per esempio al medesimo host Internet in una " +"singola connessione; in questo modo non stabilisce in modo inefficiente una " +"connessione FTP per poi chiuderla, fare qualcos'altro e quindi ristabilire " +"una connessione con il medesimo host. Questa funzionalità è utile per " +"accedere a siti FTP molto impegnati con un limite al numero di accessi " +"anonimi contemporanei. APT inoltre parallelizza le connessioni a host " +"differenti, per gestire in maniera più efficiente i siti con scarsa " "larghezza di banda." #. type: Content of: <refentry><refsect1><para> @@ -6954,7 +6996,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml:146 -#, fuzzy #| msgid "" #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" #| "replaceable>,…</literal> can be used to specify for which architectures " @@ -6967,11 +7008,10 @@ msgid "" "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove " "architectures from the set which will be downloaded." msgstr "" -"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" -"replaceable>,…</literal> può essere usato per specificare le architetture " -"per le quali scaricare le informazioni. Se questa opzione non è impostata " -"verranno scaricate tutte le architetture definite dall'opzione <literal>APT::" -"Architectures</literal>." +"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceab" +"le>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,<replaceabl" +"e>arch2</replaceable>,…</literal> possono essere usati per aggiungere e " +"rimuovere architetture dall'insieme di quelle che verranno scaricate." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml:149 @@ -8796,7 +8836,6 @@ msgstr "" #. type: <p></p> #: guide.sgml:163 -#, fuzzy #| msgid "" #| "<prgn>apt-get</prgn> has several command line options that are detailed " #| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " @@ -8807,7 +8846,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " @@ -8815,13 +8854,13 @@ msgid "" "caused them to be downloaded again without <tt>-d</tt>." msgstr "" "<prgn>apt-get</prgn> ha diverse opzioni per la riga di comando, che sono " -"documentate dettagliatamente nella sua pagina di manuale, <manref section=" -"\"8\" name=\"apt-get\">. L'opzione più utile è <tt>-d</tt>, che non installa " -"i file scaricati; se il sistema deve scaricare un gran numero di pacchetti, " +"documentate dettagliatamente nella sua pagina di manuale, <manref section=\"" +"8\" name=\"apt-get\">. L'opzione più utile è <tt>-d</tt>, che non installa i " +"file scaricati; se il sistema deve scaricare un gran numero di pacchetti, " "non è bene iniziare ad installarli nel caso qualcosa dovesse andare storto. " "Quando si usa <tt>-d</tt>, gli archivi scaricati possono essere installati " -"semplicemente eseguendo di nuovo lo stesso comando senza l'opzione <tt>-d</" -"tt>." +"semplicemente eseguendo di nuovo lo stesso comando senza l'opzione " +"<tt>-d</tt>." #. type: <heading></heading> #: guide.sgml:168 -- cgit v1.2.3 From e9db7e74c445d5b62023e0972ab3007485ca9a6f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Fri, 21 Mar 2014 12:11:27 +0100 Subject: correct some reported typos in /etc/cron.daily/apt Closes: 702016 Reported-By: Mason Loring Bliss <mason@blisses.org>, Jakub Wilk <jwilk@debian.org> --- debian/apt.cron.daily | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 71ac76555..aafd9e0ad 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -91,7 +91,7 @@ check_stamp() stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null) if [ "$?" != "0" ]; then # Due to some timezones returning 'invalid date' for midnight on - # certain dates (eg America/Sao_Paulo), if date returns with error + # certain dates (e.g. America/Sao_Paulo), if date returns with error # remove the stamp file and return 0. See coreutils bug: # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html rm -f "$stamp_file" @@ -101,14 +101,14 @@ check_stamp() now=$(date --date=$(date --iso-8601) +%s 2>/dev/null) if [ "$?" != "0" ]; then # As above, due to some timezones returning 'invalid date' for midnight - # on certain dates (eg America/Sao_Paulo), if date returns with error + # on certain dates (e.g. America/Sao_Paulo), if date returns with error # return 0. return 0 fi delta=$(($now-$stamp)) - # intervall is in days, convert to sec. + # interval is in days, convert to sec. interval=$(($interval*60*60*24)) debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)" @@ -338,7 +338,7 @@ if test -r /var/lib/apt/extended_states; then fi fi -# check apt-config exstance +# check apt-config existence if ! which apt-config >/dev/null ; then exit 0 fi -- cgit v1.2.3 From 33ad1650c3192aba5ba43128190730c88ad9d011 Mon Sep 17 00:00:00 2001 From: Kenshi Muto <kmuto@debian.org> Date: Fri, 21 Mar 2014 12:50:29 +0100 Subject: Japanese programs translation update Closes: 742255 --- po/ja.po | 270 ++++++++++++++++++++------------------------------------------- 1 file changed, 85 insertions(+), 185 deletions(-) diff --git a/po/ja.po b/po/ja.po index eda615688..fe0a94fe4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,10 +6,10 @@ # Debian Project, Kenshi Muto <kmuto@debian.org>, 2004-2012 msgid "" msgstr "" -"Project-Id-Version: apt 0.9.9.4\n" +"Project-Id-Version: apt 0.9.16.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2014-03-15 18:13+0100\n" -"PO-Revision-Date: 2013-08-11 19:39+0900\n" +"PO-Revision-Date: 2014-03-21 19:53+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" "Language: ja\n" @@ -249,17 +249,15 @@ msgid "Failed to mount '%s' to '%s'" msgstr "'%s' を '%s' にマウントできませんでした" #: cmdline/apt-cdrom.cc:178 -#, fuzzy msgid "" "No CD-ROM could be auto-detected or found using the default mount point.\n" "You may try the --cdrom option to set the CD-ROM mount point.\n" "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " "mount point." msgstr "" -"CD-ROM が自動検出されなかったか、デフォルトで利用するマウントポイントに見当た" -"りませんでした。CD-ROM のマウントポイントを設定するために --cdrom オプション" -"を試すことができます。CD-ROM の自動検出およびマウントポイントの詳細について" -"は、'man apt-cdrom' を参照してください。" +"CD-ROM が自動検出されなかったか、デフォルトで利用するマウントポイントに見当たりませんでした。\n" +"CD-ROM のマウントポイントを設定するために --cdrom オプションを試すことができます。\n" +"CD-ROM の自動検出およびマウントポイントの詳細については、'man apt-cdrom' を参照してください。" #: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." @@ -299,19 +297,19 @@ msgstr "" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" #: cmdline/apt-get.cc:245 -#, fuzzy, c-format +#, c-format msgid "Can not find a package for architecture '%s'" -msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" +msgstr "アーキテクチャ '%s' 用のパッケージは見つかりませんでした" #: cmdline/apt-get.cc:327 -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with version '%s'" -msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" +msgstr "パッケージ '%s' のバージョン '%s' は見つかりませんでした" #: cmdline/apt-get.cc:330 -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with release '%s'" -msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" +msgstr "リリース '%2$s' にはパッケージ '%1$s' は見つかりませんでした" #: cmdline/apt-get.cc:367 #, c-format @@ -319,9 +317,9 @@ msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n" #: cmdline/apt-get.cc:423 -#, fuzzy, c-format +#, c-format msgid "Can not find version '%s' of package '%s'" -msgstr "パッケージ '%2$s' の利用できないバージョン '%1$s' を無視" +msgstr "パッケージ '%2$s' のバージョン '%1$s' は見つかりませんでした" #: cmdline/apt-get.cc:454 #, c-format @@ -637,14 +635,12 @@ msgstr "" " この APT は Super Cow Powers 化されています。\n" #: cmdline/apt-helper.cc:35 -#, fuzzy msgid "Must specify at least one pair url/filename" -msgstr "" -"ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" +msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります" #: cmdline/apt-helper.cc:52 msgid "Download Failed" -msgstr "" +msgstr "ダウンロード失敗" #: cmdline/apt-helper.cc:65 msgid "" @@ -658,6 +654,15 @@ msgid "" "\n" " This APT helper has Super Meep Powers.\n" msgstr "" +"使用法: apt-helper [オプション] コマンド\n" +" apt-helper [オプション] download-file uri 目標パス\n" +"\n" +"apt-helper は apt の内部ヘルパーです\n" +"\n" +"コマンド:\n" +" download-file - 指定した uri を目標パスにダウンロードする\n" +"\n" +" この APT helper は Super Meep Powers 化されています。\n" #: cmdline/apt-mark.cc:68 #, c-format @@ -706,7 +711,6 @@ msgid "Executing dpkg failed. Are you root?" msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?" #: cmdline/apt-mark.cc:392 -#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -738,8 +742,13 @@ msgstr "" "する簡単なコマンドラインインターフェイスです。マークの一覧表示もできます。\n" "\n" "コマンド:\n" -" auto - 指定のパッケージを自動でインストールされたものとしてマークする\n" -" manual - 指定のパッケージを手動でインストールしたものとしてマークする\n" +" auto - 指定のパッケージを自動でインストールされたものとしてマークする\n" +" manual - 指定のパッケージを手動でインストールしたものとしてマークする\n" +" hold - パッケージを保留としてマークする\n" +" unhold - パッケージの保留を解除する\n" +" showauto - 自動的にインストールされたパッケージの一覧を表示する\n" +" showmanual - 手作業でインストールしたパッケージの一覧を表示する\n" +" showhold - 保留されているパッケージの一覧を表示する\n" "\n" "オプション:\n" " -h このヘルプを表示する\n" @@ -749,8 +758,7 @@ msgstr "" " -f 指定のファイルを使って自動/手動のマーキングを読み書きする\n" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 任意の設定オプションを指定する (例 -o dir::cache=/tmp)\n" -"さらなる情報については、マニュアルページ apt-mark(8) および apt.conf(5) を参" -"照してください。" +"さらなる情報については、マニュアルページ apt-mark(8) および apt.conf(5) を参照してください。" #: cmdline/apt.cc:47 msgid "" @@ -773,6 +781,23 @@ msgid "" "\n" " edit-sources - edit the source information file\n" msgstr "" +"使用法: apt [オプション] コマンド\n" +"\n" +"apt 用コマンドラインインターフェイス\n" +"基本コマンド: \n" +" list - パッケージ名を基にパッケージの一覧を表示\n" +" search - パッケージの説明を検索\n" +" show - パッケージの詳細を表示\n" +"\n" +" update - 利用可能パッケージの一覧を更新\n" +"\n" +" install - パッケージをインストール\n" +" remove - パッケージを削除\n" +"\n" +" upgrade - パッケージをインストール/更新してシステムをアップグレード\n" +" full-upgrade - パッケージを削除/インストール/更新してシステムをアップグレード\n" +"\n" +" edit-sources - ソース情報ファイルを編集\n" #: methods/cdrom.cc:203 #, c-format @@ -1148,7 +1173,7 @@ msgstr "内部エラー" #: apt-private/private-list.cc:132 msgid "Listing" -msgstr "" +msgstr "一覧表示" #: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1392,40 +1417,37 @@ msgstr "%s の取得に失敗しました %s\n" #: apt-private/private-output.cc:81 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" -msgstr "" +msgstr "不明" #: apt-private/private-output.cc:207 -#, fuzzy, c-format +#, c-format msgid "[installed,upgradable to: %s]" -msgstr " [インストール済み]" +msgstr "[インストール済み、%s にアップグレード可]" #: apt-private/private-output.cc:211 -#, fuzzy msgid "[installed,local]" -msgstr " [インストール済み]" +msgstr "[インストール済み、ローカル]" #: apt-private/private-output.cc:214 msgid "[installed,auto-removable]" -msgstr "" +msgstr "[インストール済み、自動削除可]" #: apt-private/private-output.cc:216 -#, fuzzy msgid "[installed,automatic]" -msgstr " [インストール済み]" +msgstr "[インストール済み、自動]" #: apt-private/private-output.cc:218 -#, fuzzy msgid "[installed]" -msgstr " [インストール済み]" +msgstr "[インストール済み]" #: apt-private/private-output.cc:222 #, c-format msgid "[upgradable from: %s]" -msgstr "" +msgstr "[%s からアップグレード可]" #: apt-private/private-output.cc:226 msgid "[residual-config]" -msgstr "" +msgstr "[設定未完了]" #: apt-private/private-output.cc:326 msgid "The following packages have unmet dependencies:" @@ -1586,7 +1608,7 @@ msgstr "未解決の依存関係があります。-f オプションを試して #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" -msgstr "" +msgstr "ソート中" #: apt-private/private-update.cc:31 msgid "The update command takes no arguments" @@ -1597,9 +1619,8 @@ msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " #: apt-private/private-upgrade.cc:30 -#, fuzzy msgid "Internal error, Upgrade broke stuff" -msgstr "内部エラー、AllUpgrade が何かを破壊しました" +msgstr "内部エラー、アップグレードで何か壊れました" #: apt-private/private-upgrade.cc:32 msgid "Done" @@ -1607,18 +1628,18 @@ msgstr "完了" #: apt-private/private-search.cc:51 msgid "Full Text Search" -msgstr "" +msgstr "全文検索" #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" "There are %i additional records. Please use the '-a' switch to see them." -msgstr[0] "" +msgstr[0] "追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。" #: apt-private/private-show.cc:163 msgid "not a real package (virtual)" -msgstr "" +msgstr "実際のパッケージではありません (仮想)" #: apt-private/private-main.cc:23 msgid "" @@ -1633,14 +1654,14 @@ msgstr "" " あるとは言い切れないことに注意してください!" #: apt-private/private-sources.cc:58 -#, fuzzy, c-format +#, c-format msgid "Failed to parse %s. Edit again? " -msgstr "%s を %s に名前変更できませんでした" +msgstr "%s の解析に失敗しました。再編集しますか? " #: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgstr "'%s' ファイルが変更されています。「apt-get update」を実行してください。" #: apt-private/acqprogress.cc:66 msgid "Hit " @@ -2046,9 +2067,9 @@ msgstr "'%s' をオープンできません" #. skip spaces #. find end of word #: ftparchive/override.cc:68 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu (%s)" -msgstr "不正な override %s %llu 行目 #1" +msgstr "不正な override %s %llu 行目 (%s)" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format @@ -2781,9 +2802,9 @@ msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" #: apt-pkg/sourcelist.cc:127 -#, fuzzy, c-format +#, c-format msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" +msgstr "ソースリスト %2$s の %1$u 個目の区切りが不正です (URI parse)" #: apt-pkg/sourcelist.cc:170 #, c-format @@ -2860,9 +2881,9 @@ msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" #: apt-pkg/sourcelist.cc:416 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" +msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 #, c-format @@ -2947,10 +2968,9 @@ msgid "The method driver %s could not be found." msgstr "メソッドドライバ %s が見つかりません。" #: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format +#, c-format msgid "Is the package %s installed?" -msgstr "" -"'dpkg-dev' パッケージがインストールされていることを確認してください。\n" +msgstr "パッケージ %s はインストールされていますか?" #: apt-pkg/acquire-worker.cc:169 #, c-format @@ -3090,9 +3110,8 @@ msgid "Size mismatch" msgstr "サイズが適合しません" #: apt-pkg/acquire-item.cc:173 -#, fuzzy msgid "Invalid file format" -msgstr "不正な操作 %s" +msgstr "不正なファイル形式" #: apt-pkg/acquire-item.cc:1579 #, c-format @@ -3325,9 +3344,9 @@ msgid "Couldn't find any package by regex '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" #: apt-pkg/cacheset.cc:613 -#, fuzzy, c-format +#, c-format msgid "Couldn't find any package by glob '%s'" -msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" +msgstr "'%s' に一致するパッケージは見つかりませんでした" #: apt-pkg/cacheset.cc:624 #, c-format @@ -3384,7 +3403,7 @@ msgstr "外部ソルバを実行" #: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" -msgstr "" +msgstr "進捗: [%3i%%]" #: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" @@ -3481,20 +3500,20 @@ msgstr "%s を完全に削除しました" #: apt-pkg/deb/dpkgpm.cc:1050 msgid "ioctl(TIOCGWINSZ) failed" -msgstr "" +msgstr "ioctl(TIOCGWINSZ) に失敗しました" #: apt-pkg/deb/dpkgpm.cc:1053 apt-pkg/deb/dpkgpm.cc:1074 -#, fuzzy, c-format +#, c-format msgid "Can not write log (%s)" -msgstr "%s に書き込めません" +msgstr "ログを書き込めません (%s)" #: apt-pkg/deb/dpkgpm.cc:1053 msgid "Is /dev/pts mounted?" -msgstr "" +msgstr "/dev/pts はマウントされていますか?" #: apt-pkg/deb/dpkgpm.cc:1074 msgid "Is stdout a terminal?" -msgstr "" +msgstr "標準出力はターミナルですか?" #: apt-pkg/deb/dpkgpm.cc:1562 msgid "Operation was interrupted before it could finish" @@ -3534,13 +3553,10 @@ msgstr "" "込まれません。" #: apt-pkg/deb/dpkgpm.cc:1651 apt-pkg/deb/dpkgpm.cc:1657 -#, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" -msgstr "" -"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" -"き込まれません。" +msgstr "エラーメッセージはローカルシステムの問題であることを示しているので、レポートは書き込まれません。" #: apt-pkg/deb/dpkgpm.cc:1678 msgid "" @@ -3577,119 +3593,3 @@ msgstr "" #: apt-pkg/deb/debsystem.cc:128 msgid "Not locked" msgstr "ロックされていません" - -#~ msgid "%s not a valid DEB package." -#~ msgstr "%s は正しい DEB パッケージではありません。" - -#~ msgid "" -#~ "Using CD-ROM mount point %s\n" -#~ "Mounting CD-ROM\n" -#~ msgstr "" -#~ "CD-ROM マウントポイント %s を使用します\n" -#~ "CD-ROM をマウントしています\n" - -#~ msgid "" -#~ "Could not patch %s with mmap and with file operation usage - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れて" -#~ "いるようです。" - -#~ msgid "" -#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありませ" -#~ "ん) - パッチが壊れているようです。" - -#~ msgid "Note, selecting '%s' for task '%s'\n" -#~ msgstr "注意: タスク '%2$s' に対して '%1$s' を選択しています\n" - -#~ msgid "Note, selecting '%s' for regex '%s'\n" -#~ msgstr "注意: 正規表現 '%2$s' に対して '%1$s' を選択しています\n" - -#~ msgid "Package %s is a virtual package provided by:\n" -#~ msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n" - -#~ msgid " [Not candidate version]" -#~ msgstr "[候補バージョンなし]" - -#~ msgid "You should explicitly select one to install." -#~ msgstr "インストールするパッケージを明示的に選択する必要があります。" - -#~ msgid "" -#~ "Package %s is not available, but is referred to by another package.\n" -#~ "This may mean that the package is missing, has been obsoleted, or\n" -#~ "is only available from another source\n" -#~ msgstr "" -#~ "パッケージ %s はデータベースには存在しますが、利用できません。\n" -#~ "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n" -#~ "あるいは別のソースからのみしか利用できないという状況が考えられます\n" - -#~ msgid "However the following packages replace it:" -#~ msgstr "しかし、以下のパッケージで置き換えられています:" - -#~ msgid "Package '%s' has no installation candidate" -#~ msgstr "パッケージ '%s' にはインストール候補がありません" - -#~ msgid "Virtual packages like '%s' can't be removed\n" -#~ msgstr "'%s' のような仮想パッケージは削除できません\n" - -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "パッケージ %s はインストールされていないため、削除はできません。'%s' のこ" -#~ "とでしょうか?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "パッケージ '%s' はインストールされていないため、削除はできません\n" - -#~ msgid "Note, selecting '%s' instead of '%s'\n" -#~ msgstr "注意、'%2$s' の代わりに '%1$s' を選択しています\n" - -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "すでにインストールされておりアップグレードも設定されていないため、%s をス" -#~ "キップします。\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s はインストールされていないのにアップグレードだけが要求されているので、" -#~ "スキップします。\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s はすでに最新バージョンです。\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "'%4$s' のため、'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n" - -#~ msgid "Ignore unavailable target release '%s' of package '%s'" -#~ msgstr "パッケージ '%2$s' の利用できないターゲットリリース '%1$s' を無視" - -#~ msgid "Downloading %s %s" -#~ msgstr "%s %s をダウンロードしています" - -#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -#~ msgstr "" -#~ "これは正しい DEB アーカイブではありません。'%s'、'%s'、'%s' のいずれのメン" -#~ "バーもありません" - -#~ msgid "MD5Sum mismatch" -#~ msgstr "MD5Sum が適合しません" - -#~ msgid "" -#~ "I wasn't able to locate a file for the %s package. This might mean you " -#~ "need to manually fix this package." -#~ msgstr "" -#~ "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手" -#~ "動で修正する必要があります。" - -#~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -#~ msgstr "" -#~ "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされて" -#~ "いない?)\n" -- cgit v1.2.3 From a1b6a4e7c5f5a859d27e00c2753b7f7b7e9ae14d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Fri, 21 Mar 2014 13:31:34 +0100 Subject: add testcase for APT::Architectures "arch1,arch2" Git-Dch: Ignore --- test/integration/test-bug-612958-use-dpkg-multiarch-config | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/integration/test-bug-612958-use-dpkg-multiarch-config b/test/integration/test-bug-612958-use-dpkg-multiarch-config index 4d1f00ca0..7bf5781e8 100755 --- a/test/integration/test-bug-612958-use-dpkg-multiarch-config +++ b/test/integration/test-bug-612958-use-dpkg-multiarch-config @@ -42,6 +42,15 @@ testpass 'apt config' 'armel' rm $CONFFILE +echo '#clear APT::Architectures;' >> $CONFFILE +echo 'APT::Architectures "i386,amd64";' >> $CONFFILE + +testpass 'apt config' 'i386' +testpass 'apt config' 'amd64' +testfail 'apt config' 'armel' + +rm $CONFFILE + echo '#clear APT::Architectures;' >> $CONFFILE echo 'Dir::Bin::dpkg "./dpkg-printer";' >> $CONFFILE -- cgit v1.2.3 From 63ff42089863cda53aee240ea0124106e8b4d983 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Fri, 21 Mar 2014 15:54:15 +0100 Subject: enable fvisibility=hidden for our private library While it is a huge undertaking to enable it for our public libraries as basically everything we exported so far could be seen as public interface our private library is new and under our full control, so we can do whatever we like with it. The benefits are not that big in return of course, but it reduces the size a bit, so thats great nontheless. Git-Dch: ignore --- apt-pkg/contrib/macros.h | 4 ++++ apt-private/acqprogress.h | 9 +++++---- apt-private/makefile | 1 + apt-private/private-cachefile.h | 7 ++++--- apt-private/private-cmndline.h | 3 ++- apt-private/private-download.h | 6 ++++-- apt-private/private-install.h | 8 +++++--- apt-private/private-list.h | 4 +++- apt-private/private-main.h | 4 +++- apt-private/private-moo.h | 2 +- apt-private/private-output.h | 21 ++++++++++++--------- apt-private/private-search.h | 4 +++- apt-private/private-show.h | 4 +++- apt-private/private-sources.h | 4 +++- apt-private/private-update.h | 4 +++- apt-private/private-upgrade.h | 6 ++++-- apt-private/private-utils.h | 8 +++++--- 17 files changed, 65 insertions(+), 34 deletions(-) diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index d97053553..2d6448e5e 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -94,8 +94,12 @@ #if APT_GCC_VERSION >= 0x0400 #define APT_SENTINEL __attribute__((sentinel)) + #define APT_PUBLIC __attribute__ ((visibility ("default"))) + #define APT_HIDDEN __attribute__ ((visibility ("hidden"))) #else #define APT_SENTINEL + #define APT_PUBLIC + #define APT_HIDDEN #endif // cold functions are unlikely() to be called diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h index e12dafe50..71a10d78a 100644 --- a/apt-private/acqprogress.h +++ b/apt-private/acqprogress.h @@ -10,18 +10,19 @@ #define ACQPROGRESS_H #include <apt-pkg/acquire.h> +#include <apt-pkg/macros.h> #include <string> -class AcqTextStatus : public pkgAcquireStatus +class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus { unsigned int &ScreenWidth; char BlankLine[1024]; unsigned long ID; unsigned long Quiet; - + public: - + virtual bool MediaChange(std::string Media,std::string Drive); virtual void IMSHit(pkgAcquire::ItemDesc &Itm); virtual void Fetch(pkgAcquire::ItemDesc &Itm); @@ -29,7 +30,7 @@ class AcqTextStatus : public pkgAcquireStatus virtual void Fail(pkgAcquire::ItemDesc &Itm); virtual void Start(); virtual void Stop(); - + bool Pulse(pkgAcquire *Owner); AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet); diff --git a/apt-private/makefile b/apt-private/makefile index 728890b9b..09736c6d3 100644 --- a/apt-private/makefile +++ b/apt-private/makefile @@ -16,6 +16,7 @@ LIBRARY=apt-private MAJOR=0.0 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg +CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main utils sources SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc) diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h index 67c5e8cdc..dce7e0a3a 100644 --- a/apt-private/private-cachefile.h +++ b/apt-private/private-cachefile.h @@ -5,16 +5,17 @@ #include <apt-pkg/progress.h> #include <apt-pkg/configuration.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/macros.h> // class CacheFile - Cover class for some dependency cache functions /*{{{*/ // --------------------------------------------------------------------- /* */ -class CacheFile : public pkgCacheFile +class APT_PUBLIC CacheFile : public pkgCacheFile { static pkgCache *SortCache; - static int NameComp(const void *a,const void *b) APT_PURE; - + APT_HIDDEN static int NameComp(const void *a,const void *b) APT_PURE; + public: pkgCache::Package **List; diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h index 76045ffe7..d0af16782 100644 --- a/apt-private/private-cmndline.h +++ b/apt-private/private-cmndline.h @@ -2,9 +2,10 @@ #define APT_PRIVATE_CMNDLINE_H #include <apt-pkg/cmndline.h> +#include <apt-pkg/macros.h> #include <vector> -std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char const * const Cmd); +APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char const * const Cmd); #endif diff --git a/apt-private/private-download.h b/apt-private/private-download.h index 1447845ed..a108aa531 100644 --- a/apt-private/private-download.h +++ b/apt-private/private-download.h @@ -1,9 +1,11 @@ #ifndef APT_PRIVATE_DOWNLOAD_H #define APT_PRIVATE_DOWNLOAD_H +#include <apt-pkg/macros.h> + class pkgAcquire; -bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser); -bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure); +APT_PUBLIC bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser); +APT_PUBLIC bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure); #endif diff --git a/apt-private/private-install.h b/apt-private/private-install.h index 79769d470..5e18560c5 100644 --- a/apt-private/private-install.h +++ b/apt-private/private-install.h @@ -9,6 +9,9 @@ #include <apt-pkg/cacheset.h> #include <apt-pkg/strutl.h> #include <apt-pkg/algorithms.h> +#include <apt-pkg/macros.h> + +#include <apt-private/private-output.h> #include <stddef.h> #include <iosfwd> @@ -17,7 +20,6 @@ #include <string> #include <utility> -#include "private-output.h" #include <apti18n.h> @@ -26,13 +28,13 @@ class CommandLine; #define RAMFS_MAGIC 0x858458f6 -bool DoInstall(CommandLine &Cmd); +APT_PUBLIC bool DoInstall(CommandLine &Cmd); bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, std::map<unsigned short, APT::VersionSet> &verset); bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache); -bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, +APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, bool Safety = true); diff --git a/apt-private/private-list.h b/apt-private/private-list.h index 749744dd1..461f527cb 100644 --- a/apt-private/private-list.h +++ b/apt-private/private-list.h @@ -1,9 +1,11 @@ #ifndef APT_PRIVATE_LIST_H #define APT_PRIVATE_LIST_H +#include <apt-pkg/macros.h> + class CommandLine; -bool List(CommandLine &Cmd); +APT_PUBLIC bool List(CommandLine &Cmd); #endif diff --git a/apt-private/private-main.h b/apt-private/private-main.h index 257c51a0b..23d4aca68 100644 --- a/apt-private/private-main.h +++ b/apt-private/private-main.h @@ -1,8 +1,10 @@ #ifndef APT_PRIVATE_MAIN_H #define APT_PRIVATE_MAIN_H +#include <apt-pkg/macros.h> + class CommandLine; -void CheckSimulateMode(CommandLine &CmdL); +APT_PUBLIC void CheckSimulateMode(CommandLine &CmdL); #endif diff --git a/apt-private/private-moo.h b/apt-private/private-moo.h index 7bfc5c1fc..b8e1cfed6 100644 --- a/apt-private/private-moo.h +++ b/apt-private/private-moo.h @@ -3,7 +3,7 @@ class CommandLine; -bool DoMoo(CommandLine &CmdL); +APT_PUBLIC bool DoMoo(CommandLine &CmdL); bool DoMoo1(CommandLine &CmdL); bool DoMoo2(CommandLine &CmdL); bool DoMoo3(CommandLine &CmdL); diff --git a/apt-private/private-output.h b/apt-private/private-output.h index 81643f90a..9633d0c37 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -2,6 +2,7 @@ #define APT_PRIVATE_OUTPUT_H #include <apt-pkg/pkgcache.h> +#include <apt-pkg/macros.h> #include <fstream> #include <string> @@ -13,22 +14,24 @@ class pkgDepCache; class pkgRecords; -extern std::ostream c0out; -extern std::ostream c1out; -extern std::ostream c2out; -extern std::ofstream devnull; -extern unsigned int ScreenWidth; +APT_PUBLIC extern std::ostream c0out; +APT_PUBLIC extern std::ostream c1out; +APT_PUBLIC extern std::ostream c2out; +APT_PUBLIC extern std::ofstream devnull; +APT_PUBLIC extern unsigned int ScreenWidth; -bool InitOutput(); -void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, +APT_PUBLIC bool InitOutput(); + +void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::VerIterator V, std::ostream &out, bool include_summary=true); // helper to describe global state -bool ShowList(std::ostream &out, std::string Title, std::string List, +APT_PUBLIC void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now); + +APT_PUBLIC bool ShowList(std::ostream &out, std::string Title, std::string List, std::string VersionsList); -void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now); void ShowNew(std::ostream &out,CacheFile &Cache); void ShowDel(std::ostream &out,CacheFile &Cache); void ShowKept(std::ostream &out,CacheFile &Cache); diff --git a/apt-private/private-search.h b/apt-private/private-search.h index 539915f1f..d4786233a 100644 --- a/apt-private/private-search.h +++ b/apt-private/private-search.h @@ -1,9 +1,11 @@ #ifndef APT_PRIVATE_SEARCH_H #define APT_PRIVATE_SEARCH_H +#include <apt-pkg/macros.h> + class CommandLine; -bool FullTextSearch(CommandLine &CmdL); +APT_PUBLIC bool FullTextSearch(CommandLine &CmdL); #endif diff --git a/apt-private/private-show.h b/apt-private/private-show.h index a15367e28..359aeeb28 100644 --- a/apt-private/private-show.h +++ b/apt-private/private-show.h @@ -1,12 +1,14 @@ #ifndef APT_PRIVATE_SHOW_H #define APT_PRIVATE_SHOW_H +#include <apt-pkg/macros.h> + class CommandLine; namespace APT { namespace Cmd { - bool ShowPackage(CommandLine &CmdL); + APT_PUBLIC bool ShowPackage(CommandLine &CmdL); } } #endif diff --git a/apt-private/private-sources.h b/apt-private/private-sources.h index 4c58af180..0c421902e 100644 --- a/apt-private/private-sources.h +++ b/apt-private/private-sources.h @@ -1,8 +1,10 @@ #ifndef APT_PRIVATE_SOURCES_H #define APT_PRIVATE_SOURCES_H +#include <apt-pkg/macros.h> + class CommandLine; -bool EditSources(CommandLine &CmdL); +APT_PUBLIC bool EditSources(CommandLine &CmdL); #endif diff --git a/apt-private/private-update.h b/apt-private/private-update.h index d3d0b7af9..e584f70cf 100644 --- a/apt-private/private-update.h +++ b/apt-private/private-update.h @@ -1,8 +1,10 @@ #ifndef APT_PRIVATE_UPDATE_H #define APT_PRIVATE_UPDATE_H +#include <apt-pkg/macros.h> + class CommandLine; -bool DoUpdate(CommandLine &CmdL); +APT_PUBLIC bool DoUpdate(CommandLine &CmdL); #endif diff --git a/apt-private/private-upgrade.h b/apt-private/private-upgrade.h index 64c4c0874..16bb93c9b 100644 --- a/apt-private/private-upgrade.h +++ b/apt-private/private-upgrade.h @@ -1,10 +1,12 @@ #ifndef APTPRIVATE_PRIVATE_UPGRADE_H #define APTPRIVATE_PRIVATE_UPGRADE_H +#include <apt-pkg/macros.h> + class CommandLine; -bool DoDistUpgrade(CommandLine &CmdL); -bool DoUpgrade(CommandLine &CmdL); +APT_PUBLIC bool DoDistUpgrade(CommandLine &CmdL); +APT_PUBLIC bool DoUpgrade(CommandLine &CmdL); bool DoUpgradeNoNewPackages(CommandLine &CmdL); bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL); diff --git a/apt-private/private-utils.h b/apt-private/private-utils.h index 4bb535e86..432699787 100644 --- a/apt-private/private-utils.h +++ b/apt-private/private-utils.h @@ -1,9 +1,11 @@ #ifndef APT_PRIVATE_UTILS_H #define APT_PRIVATE_UTILS_H -#include<string> +#include <apt-pkg/macros.h> -void DisplayFileInPager(std::string filename); -void EditFileInSensibleEditor(std::string filename); +#include <string> + +APT_PUBLIC void DisplayFileInPager(std::string filename); +APT_PUBLIC void EditFileInSensibleEditor(std::string filename); #endif -- cgit v1.2.3 From ce62f1def6565375ce9c56eb1237ccdc0ca138ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Fri, 21 Mar 2014 16:26:01 +0100 Subject: mark optional (private) symbols as hidden This methods should not be used by anyone expect the library itself as they are helpers for the specific class and therefore perfect candidates for hidding. Git-Dch: Ignore --- apt-pkg/acquire-method.h | 4 ++- apt-pkg/cdrom.h | 4 ++- apt-pkg/contrib/fileutl.h | 6 ++--- apt-pkg/deb/deblistparser.h | 3 ++- apt-pkg/edsp.h | 11 ++++---- apt-pkg/pkgcachegen.h | 18 ++++++------- apt-pkg/tagfile.h | 8 +++--- debian/libapt-pkg4.12.symbols | 59 ++++++++++++++----------------------------- 8 files changed, 50 insertions(+), 63 deletions(-) diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index f0f2a537a..221ccf273 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -20,6 +20,8 @@ #ifndef PKGLIB_ACQUIRE_METHOD_H #define PKGLIB_ACQUIRE_METHOD_H +#include <apt-pkg/macros.h> + #include <stdarg.h> #include <time.h> @@ -107,7 +109,7 @@ class pkgAcqMethod virtual ~pkgAcqMethod() {}; private: - void Dequeue(); + APT_HIDDEN void Dequeue(); }; /** @} */ diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 0ed4a6a73..0f2c2cd02 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -1,6 +1,8 @@ #ifndef PKGLIB_CDROM_H #define PKGLIB_CDROM_H +#include <apt-pkg/macros.h> + #include<string> #include<vector> @@ -73,7 +75,7 @@ class pkgCdrom /*{{{*/ bool Add(pkgCdromStatus *log); private: - bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, + APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log, bool const interactive); }; /*}}}*/ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 278a25742..f25ed3622 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -150,11 +150,11 @@ class FileFd private: FileFdPrivate* d; - bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor); + APT_HIDDEN bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor); // private helpers to set Fail flag and call _error->Error - bool FileFdErrno(const char* Function, const char* Description,...) APT_PRINTF(3) APT_COLD; - bool FileFdError(const char* Description,...) APT_PRINTF(2) APT_COLD; + APT_HIDDEN bool FileFdErrno(const char* Function, const char* Description,...) APT_PRINTF(3) APT_COLD; + APT_HIDDEN bool FileFdError(const char* Description,...) APT_PRINTF(2) APT_COLD; }; bool RunScripts(const char *Cnf); diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 286244cc9..baace79fe 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -15,6 +15,7 @@ #include <apt-pkg/tagfile.h> #include <apt-pkg/md5.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/macros.h> #include <string> #include <vector> @@ -102,7 +103,7 @@ class debListParser : public pkgCacheGenerator::ListParser virtual ~debListParser() {}; private: - unsigned char ParseMultiArch(bool const showErrors); + APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors); }; #endif diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index ae20ed7db..f3092d3c6 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -12,6 +12,7 @@ #include <apt-pkg/cacheset.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> +#include <apt-pkg/macros.h> #include <stdio.h> @@ -32,15 +33,15 @@ class EDSP /*{{{*/ static const char * const PrioMap[]; static const char * const DepMap[]; - bool static ReadLine(int const input, std::string &line); - bool static StringToBool(char const *answer, bool const defValue); + APT_HIDDEN bool static ReadLine(int const input, std::string &line); + APT_HIDDEN bool static StringToBool(char const *answer, bool const defValue); - void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output, + APT_HIDDEN void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver); - void static WriteScenarioDependency(FILE* output, + APT_HIDDEN void static WriteScenarioDependency(FILE* output, pkgCache::VerIterator const &Ver); - void static WriteScenarioLimitedDependency(FILE* output, + APT_HIDDEN void static WriteScenarioLimitedDependency(FILE* output, pkgCache::VerIterator const &Ver, APT::PackageSet const &pkgset); public: diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 5994dab9f..1e1a71026 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -38,10 +38,10 @@ class pkgCacheGenerator /*{{{*/ private: pkgCache::StringItem *UniqHash[26]; - map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; - map_ptrloc WriteStringInMap(const char *String); - map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len); - map_ptrloc AllocateInMap(const unsigned long &size); + APT_HIDDEN map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; + APT_HIDDEN map_ptrloc WriteStringInMap(const char *String); + APT_HIDDEN map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len); + APT_HIDDEN map_ptrloc AllocateInMap(const unsigned long &size); public: @@ -117,14 +117,14 @@ class pkgCacheGenerator /*{{{*/ ~pkgCacheGenerator(); private: - bool MergeListGroup(ListParser &List, std::string const &GrpName); - bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg); - bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg, + APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName); + APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg); + APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg, std::string const &Version, pkgCache::VerIterator* &OutVer); - bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P, + APT_HIDDEN bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P, pkgCache::VerIterator &V); - bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D); + APT_HIDDEN bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D); }; /*}}}*/ // This is the abstract package list parser class. /*{{{*/ diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 2f600d397..d5b62e76d 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -20,6 +20,8 @@ #ifndef PKGLIB_TAGFILE_H #define PKGLIB_TAGFILE_H +#include <apt-pkg/macros.h> + #include <stdio.h> #include <string> @@ -93,9 +95,9 @@ class pkgTagFile { pkgTagFilePrivate *d; - bool Fill(); - bool Resize(); - bool Resize(unsigned long long const newSize); + APT_HIDDEN bool Fill(); + APT_HIDDEN bool Resize(); + APT_HIDDEN bool Resize(unsigned long long const newSize); public: diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index c1747bc9e..b6c2f75b0 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -184,9 +184,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgRecords::Parser::~Parser()@Base" 0.8.0 (c++)"pkgRecords::pkgRecords(pkgCache&)@Base" 0.8.0 (c++)"pkgRecords::~pkgRecords()@Base" 0.8.0 - (c++)"pkgTagFile::Fill()@Base" 0.8.0 (c++)"pkgTagFile::Step(pkgTagSection&)@Base" 0.8.0 - (c++)"pkgTagFile::Resize()@Base" 0.8.0 (c++)"pkgTagFile::~pkgTagFile()@Base" 0.8.0 (c++)"CdromDevice::~CdromDevice()@Base" 0.8.0 (c++)"CommandLine::DispatchArg(CommandLine::Dispatch*, bool)@Base" 0.8.0 @@ -517,11 +515,8 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgCacheGenerator::SelectFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 - (c++)"pkgCacheGenerator::AllocateInMap(unsigned long const&)@Base" 0.8.0 (c++)"pkgCacheGenerator::MakeStatusCache(pkgSourceList&, OpProgress*, MMap**, bool)@Base" 0.8.0 (c++)"pkgCacheGenerator::WriteUniqString(char const*, unsigned int)@Base" 0.8.0 - (c++)"pkgCacheGenerator::WriteStringInMap(char const*)@Base" 0.8.0 - (c++)"pkgCacheGenerator::WriteStringInMap(char const*, unsigned long const&)@Base" 0.8.0 (c++)"pkgCacheGenerator::CreateDynamicMMap(FileFd*, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::MergeFileProvides(pkgCacheGenerator::ListParser&)@Base" 0.8.0 (c++)"pkgCacheGenerator::MakeOnlyStatusCache(OpProgress*, DynamicMMap**)@Base" 0.8.0 @@ -1126,24 +1121,24 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (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 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 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 + (arch=i386 hurd-i386 kfreebsd-i386|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4 + (arch=armel armhf|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4 + (arch=alpha|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4 + (arch=powerpc powerpcspe x32|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4 + (arch=amd64 kfreebsd-amd64 s390 s390x|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4 + (arch=hppa mips mipsel sparc|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4 + (arch=ia64 sparc64|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4 + (arch=sh4|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4 + (arch=ppc64|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned long&)@Base" 0.8.11.4 + (arch=i386 hurd-i386 kfreebsd-i386|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4 + (arch=armel armhf|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4 + (arch=alpha|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4 + (arch=powerpc powerpcspe x32|c++)"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++)"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++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4 + (arch=ia64 sparc64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1 + (arch=sh4|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4 + (arch=ppc64|c++)"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 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 @@ -1196,7 +1191,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12 (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12 (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13 - (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2 + (c++)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2 (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2 (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1 (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3 @@ -1237,18 +1232,14 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"EDSP::ReadRequest(int, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, bool&, bool&, bool&)@Base" 0.8.16~exp2 (c++)"EDSP::ApplyRequest(std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, pkgDepCache&)@Base" 0.8.16~exp2 (c++)"EDSP::ReadResponse(int, pkgDepCache&, OpProgress*)@Base" 0.8.16~exp2 - (c++)"EDSP::StringToBool(char const*, bool)@Base" 0.8.16~exp2 (c++)"EDSP::WriteRequest(pkgDepCache&, _IO_FILE*, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2 (c++)"EDSP::ExecuteSolver(char const*, int*, int*)@Base" 0.8.16~exp2 (c++)"EDSP::WriteProgress(unsigned short, char const*, _IO_FILE*)@Base" 0.8.16~exp2 (c++)"EDSP::WriteScenario(pkgDepCache&, _IO_FILE*, OpProgress*)@Base" 0.8.16~exp2 (c++)"EDSP::WriteSolution(pkgDepCache&, _IO_FILE*)@Base" 0.8.16~exp2 (c++)"EDSP::ResolveExternal(char const*, pkgDepCache&, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2 - (c++)"EDSP::WriteScenarioVersion(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2 - (c++)"EDSP::WriteScenarioDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2 (c++)"EDSP::DepMap@Base" 0.8.16~exp2 (c++)"EDSP::PrioMap@Base" 0.8.16~exp2 - (c++)"EDSP::ReadLine(int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.16~exp2 (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.16~exp6 (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6 (c++)"typeinfo for edspIFType@Base" 0.8.16~exp2 @@ -1385,7 +1376,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"SummationImplementation::AddFD(FileFd&, unsigned long long)@Base" 0.8.16~exp9 (c++)"Hashes::AddFD(FileFd&, unsigned long long, bool, bool, bool, bool)@Base" 0.8.16~exp9 (c++|optional=deprecated,previous-inline)"FileFd::gzFd()@Base" 0.8.0 - (c++|optional=private)"FileFd::OpenInternDescriptor(unsigned int, APT::Configuration::Compressor const&)@Base" 0.8.16~exp9 ### CacheSet rework: making them real containers breaks bigtime the API (for the CacheSetHelper) (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator::getPkg() const@Base" 0.8.16~exp9 (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::getConstructor() const@Base" 0.8.16~exp9 @@ -1425,7 +1415,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::VersionContainerInterface::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9 (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list<APT::VersionContainerInterface::Modifier, std::allocator<APT::VersionContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9 (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9 - (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9 @@ -1537,11 +1526,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10 (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PrvIterator const&) const@Base" 0.8.16~exp10 (c++)"FileFd::Write(int, void const*, unsigned long long)@Base" 0.8.16~exp14 - (c++|optional=private)"pkgCacheGenerator::MergeListGroup(pkgCacheGenerator::ListParser&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp7 - (c++|optional=private)"pkgCacheGenerator::MergeListPackage(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7 - (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7 - (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7 - (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7 (c++)"pkgTagSection::Exists(char const*)@Base" 0.9.7.9~exp1 (c++)"_strrstrip(char*)@Base" 0.9.7.9~exp2 (c++)"SplitClearSignedFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, FileFd*, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*, FileFd*)@Base" 0.9.7.9~exp2 @@ -1550,7 +1534,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"SigVerify::RunGPGV(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int const&)@Base" 0.9.7.9~exp2 (c++)"Configuration::Dump(std::basic_ostream<char, std::char_traits<char> >&, char const*, char const*, bool)@Base" 0.9.3 (c++)"AcquireUpdate(pkgAcquire&, int, bool, bool)@Base" 0.9.3 - (c++|optional=private)"pkgAcqMethod::Dequeue()@Base" 0.9.4 (c++)"pkgCache::DepIterator::IsMultiArchImplicit() const@Base" 0.9.6 (c++)"pkgCache::PrvIterator::IsMultiArchImplicit() const@Base" 0.9.6 (c++)"APT::PackageContainerInterface::FromGroup(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.9.7 @@ -1565,8 +1548,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::VerIterator const&) const@Base" 0.9.8 (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, unsigned int, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.9.8 (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, unsigned long, unsigned long)@Base" 0.9.8 - (c++)"FileFd::FileFdErrno(char const*, char const*, ...)@Base" 0.9.9 - (c++)"FileFd::FileFdError(char const*, ...)@Base" 0.9.9 (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, GlobalError::Item)@Base" 0.9.9 (c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 @@ -1579,7 +1560,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::GrpIterator const&)@Base" 0.9.11 (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::PkgIterator const&)@Base" 0.9.11 (c++)"APT::PackageContainerInterface::FromFnmatch(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.9.11 - (c++|optional=private)"pkgTagFile::Resize(unsigned long long)@Base" 0.9.11 (c++)"pkgTagSection::pkgTagSection()@Base" 0.9.11 (c++)"strv_length(char const**)@Base" 0.9.11 (c++)"StringSplit(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0.9.11.3 @@ -1591,7 +1571,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1 (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 (c++)"GetTempDir()@Base" 0.9.14.2 - (c++|optional=private)"pkgCdrom::MountAndIdentCDROM(Configuration&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, pkgCdromStatus*)@Base" 0.9.15.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0 ### gcc-4.6 artefacts -- cgit v1.2.3 From d151adbf2cc4d23c240c6c4fcfbfda439a98c36f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sat, 22 Mar 2014 21:35:57 +0100 Subject: ensure proper teardown in dpkg error cases We have to properly close our pseudo terminals even in error cases before we call post-invoke scripts. This is done now by breaking from the dpkg calling loop instead of copying the handling, which did it in the wrong order before. This also ensures that our state file is written in error cases to record autobit and co as this was forgotten before. Closes: 738969 --- apt-pkg/deb/dpkgpm.cc | 24 ++-- .../test-apt-progress-fd-error-postinst | 22 ---- test/integration/test-failing-maintainer-scripts | 132 +++++++++++++++++++++ 3 files changed, 139 insertions(+), 39 deletions(-) delete mode 100755 test/integration/test-apt-progress-fd-error-postinst create mode 100755 test/integration/test-failing-maintainer-scripts diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 9fee7c923..5a5fff13b 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1530,28 +1530,18 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) // here but keep the loop going and just report it as a error // for later bool const stopOnError = _config->FindB("Dpkg::StopOnError",true); - - if(stopOnError) - RunScripts("DPkg::Post-Invoke"); - if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) + if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) strprintf(d->dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]); else if (WIFEXITED(Status) != 0) strprintf(d->dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); - else + else strprintf(d->dpkg_error, "Sub-process %s exited unexpectedly",Args[0]); + _error->Error("%s", d->dpkg_error.c_str()); - if(d->dpkg_error.size() > 0) - _error->Error("%s", d->dpkg_error.c_str()); - - if(stopOnError) - { - CloseLog(); - StopPtyMagic(); - d->progress->Stop(); - return false; - } - } + if(stopOnError) + break; + } } // dpkg is done at this point d->progress->Stop(); @@ -1582,7 +1572,7 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) } Cache.writeStateFile(NULL); - return true; + return d->dpkg_error.empty(); } void SigINT(int /*sig*/) { diff --git a/test/integration/test-apt-progress-fd-error-postinst b/test/integration/test-apt-progress-fd-error-postinst deleted file mode 100755 index 0b6e70212..000000000 --- a/test/integration/test-apt-progress-fd-error-postinst +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -e - -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework - -setupenvironment -configarchitecture 'amd64' 'i386' - -mkdir -p DEBIAN/ -echo "#!/bin/sh\nexit 1" > DEBIAN/postinst -chmod 755 DEBIAN/postinst - -buildsimplenativepackage 'postinst-error' 'amd64,i386' '0.8.15' 'stable' '' 'pkg with posinst error' '' '' './DEBIAN' - -setupaptarchive - -exec 3> apt-progress.log -testfailure aptget install postinst-error -y -o APT::Status-Fd=3 -msgtest "Ensure correct error message for postinst error" -grep -q "pmerror:postinst-error :80:subprocess installed post-installation script returned error exit status 2" apt-progress.log && msgpass || msgfail - diff --git a/test/integration/test-failing-maintainer-scripts b/test/integration/test-failing-maintainer-scripts new file mode 100755 index 000000000..cb82ebc7a --- /dev/null +++ b/test/integration/test-failing-maintainer-scripts @@ -0,0 +1,132 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'native' + +# create a bunch of failures +createfailure() { + setupsimplenativepackage "failure-$1" 'native' '1.0' 'unstable' 'Depends: dependee' + BUILDDIR="incoming/failure-$1-1.0" + echo '#!/bin/sh +exit 29' > ${BUILDDIR}/debian/$1 + buildpackage "$BUILDDIR" 'unstable' 'main' 'native' + rm -rf "$BUILDDIR" +} + +buildsimplenativepackage 'dependee' 'native' '1.0' 'unstable' +createfailure 'preinst' +createfailure 'postinst' +createfailure 'prerm' +createfailure 'postrm' + +setupaptarchive + +# create a library to noop chroot() and rewrite maintainer script executions +# via execvp() as used by dpkg as we don't want our rootdir to be a fullblown +# chroot directory dpkg could chroot into to execute the maintainer scripts +cat << EOF > noopchroot.c +#define _GNU_SOURCE +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <dlfcn.h> + +static char * chrootdir = NULL; + +int chroot(const char *path) { + printf("WARNING: CHROOTing to %s was ignored!\n", path); + free(chrootdir); + chrootdir = strdup(path); + return 0; +} +int execvp(const char *file, char *const argv[]) { + static int (*func_execvp) (const char *, char * const []) = NULL; + if (func_execvp == NULL) + func_execvp = (int (*) (const char *, char * const [])) dlsym(RTLD_NEXT, "execvp"); + if (chrootdir == NULL || strncmp(file, "/var/lib/dpkg/", strlen("/var/lib/dpkg/")) != 0) + return func_execvp(file, argv); + printf("REWRITE execvp call %s into %s\n", file, chrootdir); + char newfile[strlen(chrootdir) + strlen(file)]; + strcpy(newfile, chrootdir); + strcat(newfile, file); + return func_execvp(newfile, argv); +} +EOF +testsuccess gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl + +mkdir -p "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/" +DPKG="${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" +echo "#!/bin/sh +if [ -n \"\$LD_PRELOAD\" ]; then + export LD_PRELOAD=\"${TMPWORKINGDIRECTORY}/noopchroot.so \${LD_PRELOAD}\" +else + export LD_PRELOAD=\"${TMPWORKINGDIRECTORY}/noopchroot.so\" +fi +dpkg \"\$@\"" > $DPKG +chmod +x $DPKG +sed -ie "s|^DPKG::options:: \"dpkg\";\$|DPKG::options:: \"$DPKG\";|" aptconfig.conf + +# setup some pre- and post- invokes to check the output isn't garbled later +APTHOOK="${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apthook" +echo '#!/bin/sh +echo "$1: START" +echo "$1: MaiN" +echo "$1: ENd"' > $APTHOOK +chmod +x $APTHOOK +echo "DPKG::Pre-Invoke:: \"${APTHOOK} PRE\"; +DPKG::Post-Invoke:: \"${APTHOOK} POST\";" > rootdir/etc/apt/apt.conf.d/99apthooks + +testmyfailure() { + local PROGRESS='rootdir/tmp/progress.log' + exec 3> $PROGRESS + testfailure "$@" -o APT::Status-Fd=3 + msgtest 'Test for failure message of maintainerscript in' 'console log' + local TEST='rootdir/tmp/testfailure.output' + if grep -q 'exit status 29$' "$TEST"; then + msgpass + else + cat $TEST + msgfail + fi + msgtest 'Test for proper execution of invoke scripts in' 'console log' + if grep -q '^PRE: START$' $TEST && + grep -q '^PRE: MaiN$' $TEST && + grep -q '^PRE: ENd$' $TEST && + grep -q '^POST: START$' $TEST && + grep -q '^POST: MaiN$' $TEST && + grep -q '^POST: ENd$' $TEST; then + msgpass + else + cat $TEST + msgfail + fi + msgtest 'Test for failure message of maintainerscript in' 'progress log' + if grep -q '^pmerror:.\+exit status 29$' "$PROGRESS"; then + msgpass + else + cat $PROGRESS + msgfail + fi + testmarkedauto 'dependee' +} + +cp -a rootdir/var/lib/dpkg/status rootdir/var/lib/dpkg/status.backup +testmyfailure aptget install failure-preinst -y +cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status +testmyfailure aptget install failure-postinst -y +cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status +testsuccess aptget install failure-prerm -y +testdpkginstalled failure-prerm +testmyfailure aptget purge failure-prerm -y +cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status +testsuccess aptget install failure-postrm -y +testdpkginstalled failure-postrm +testmyfailure aptget purge failure-postrm -y + +# FIXME: test with output going to a PTY as it usually does +#cp -a rootdir/var/lib/dpkg/status.backup rootdir/var/lib/dpkg/status +#aptget install failure-preinst -y -- cgit v1.2.3 From d3d9e102c0eb169cb9ab3ad18b07f5a03bf0598d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Sun, 23 Mar 2014 00:50:05 +0100 Subject: update symbols file to include new symbols from 0.9.16 --- debian/libapt-pkg4.12.symbols | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index b6c2f75b0..5d7b21f10 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1571,6 +1571,14 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1 (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 (c++)"GetTempDir()@Base" 0.9.14.2 + (c++)"APT::Configuration::getBuildProfiles()@Base" 0.9.16 + (c++)"APT::Configuration::getBuildProfilesString()@Base" 0.9.16 + (c++)"Configuration::FindVector(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.9.16 + (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.9.16 + (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&)@Base" 0.9.16 + (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&, bool const&)@Base" 0.9.16 + (c++)"pkgCacheGenerator::ListParser::SameVersion(unsigned short, pkgCache::VerIterator const&)@Base" 0.9.16 + (c++)"Rename(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.16 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0 ### gcc-4.6 artefacts -- cgit v1.2.3 From be7ce6f1d067fa62b01685e48094f3f73c95189f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Tue, 11 Mar 2014 15:32:40 +0100 Subject: do IsInstallOk call in MarkInstall unconditionally Hooked checks could be influenced by AutoInst as a lot can happen between a call without and one with this bit set. The real cache-hit check is above this call already. Individual hooked checks can then inspect the state if they want to cache. Calling them multiple times shouldn't be a problem either way. --- apt-pkg/depcache.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index e2c412757..5fa88a5d2 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1059,10 +1059,9 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, return true; } - // check if we are allowed to install the package (if we haven't already) - if (P.Mode != ModeInstall || P.InstallVer != P.CandidateVer) - if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false) - return false; + // check if we are allowed to install the package + if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false) + return false; ActionGroup group(*this); P.iFlags &= ~AutoKept; @@ -1308,6 +1307,11 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, if (FromUser == true) // as always: user is always right return true; + // if we have checked before and it was okay, it will still be okay + if (PkgState[Pkg->ID].Mode == ModeInstall && + PkgState[Pkg->ID].InstallVer == PkgState[Pkg->ID].CandidateVer) + return true; + // ignore packages with none-M-A:same candidates VerIterator const CandVer = PkgState[Pkg->ID].CandidateVerIter(*this); if (unlikely(CandVer.end() == true) || CandVer == Pkg.CurrentVer() || -- cgit v1.2.3 From 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <david@kalnischkies.de> Date: Tue, 11 Mar 2014 10:31:44 +0100 Subject: discard candidates via IsInstallOk to allow override In commit 446551c8 I changed MarkInstall to discard the candidate if the candidate can't satisfy the dependency. This breaks interactive solvers like aptitude which can change the candidate on-the-fly later. In commit df77d8a5 I introduced this 'early' loop-breaking to begin with which can't be that helpful for interactive solvers as well, but makes perfect sense for non-interactives to stop them from exploring trees which can't be satisfied, but it isn't perfect as ideally we would check this before auto-installing the first dependency. This commit therefore moves the loop into its own IsInstallOk hook so that frontends can override this check if they want to and in exchange removes the loop-breaking from MarkInstall itself and does it before any dependency is installed. Closes: 740750 --- apt-pkg/depcache.cc | 78 ++++++++++++++++------ apt-pkg/depcache.h | 2 + .../test-bug-735967-lib32-to-i386-unavailable | 3 + 3 files changed, 63 insertions(+), 20 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5fa88a5d2..19a6e0d7e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1122,32 +1122,22 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, continue; /* Check if this dep should be consider for install. If it is a user - defined important dep and we are installed a new package then + defined important dep and we are installed a new package then it will be installed. Otherwise we only check for important - deps that have changed from the installed version - */ + deps that have changed from the installed version */ if (IsImportantDep(Start) == false) continue; - /* If we are in an or group locate the first or that can - succeed. We have already cached this.. */ + /* If we are in an or group locate the first or that can + succeed. We have already cached this… */ for (; Ors > 1 && (DepState[Start->ID] & DepCVer) != DepCVer; --Ors) ++Start; + + /* unsatisfiable dependency: IsInstallOkDependenciesSatisfiableByCandidates + would have prevented us to get here if not overridden, so just skip + over the problem here as the frontend will know what it is doing */ if (Ors == 1 && (DepState[Start->ID] &DepCVer) != DepCVer && Start.IsNegative() == false) - { - if(DebugAutoInstall == true) - std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl; - if (Start.IsCritical() == false) - continue; - // if the dependency was critical, we have absolutely no chance to install it, - // so if it wasn't installed remove it again. If it was, discard the candidate - // as the problemresolver will trip over it otherwise trying to install it (#735967) - if (Pkg->CurrentVer == 0) - MarkDelete(Pkg,false,Depth + 1, false); - else - SetCandidateVersion(Pkg.CurrentVer()); - return false; - } + continue; /* Check if any ImportantDep() (but not Critical) were added * since we installed the package. Also check for deps that @@ -1299,7 +1289,8 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst, unsigned long Depth, bool FromUser) { - return IsInstallOkMultiArchSameVersionSynced(Pkg,AutoInst, Depth, FromUser); + return IsInstallOkMultiArchSameVersionSynced(Pkg,AutoInst, Depth, FromUser) && + IsInstallOkDependenciesSatisfiableByCandidates(Pkg,AutoInst, Depth, FromUser); } bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, bool const /*AutoInst*/, unsigned long const Depth, bool const FromUser) @@ -1342,6 +1333,53 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, return false; } + return true; +} +bool pkgDepCache::IsInstallOkDependenciesSatisfiableByCandidates(PkgIterator const &Pkg, + bool const AutoInst, unsigned long const Depth, bool const /*FromUser*/) +{ + if (AutoInst == false) + return true; + + VerIterator const CandVer = PkgState[Pkg->ID].CandidateVerIter(*this); + if (unlikely(CandVer.end() == true) || CandVer == Pkg.CurrentVer()) + return true; + + for (DepIterator Dep = CandVer.DependsList(); Dep.end() != true;) + { + // Grok or groups + DepIterator Start = Dep; + bool Result = true; + unsigned Ors = 0; + for (bool LastOR = true; Dep.end() == false && LastOR == true; ++Dep, ++Ors) + { + LastOR = (Dep->CompareOp & Dep::Or) == Dep::Or; + + if ((DepState[Dep->ID] & DepInstall) == DepInstall) + Result = false; + } + + if (Start.IsCritical() == false || Start.IsNegative() == true || Result == false) + continue; + + /* If we are in an or group locate the first or that can succeed. + We have already cached this… */ + for (; Ors > 1 && (DepState[Start->ID] & DepCVer) != DepCVer; --Ors) + ++Start; + + if (Ors == 1 && (DepState[Start->ID] &DepCVer) != DepCVer) + { + if (DebugAutoInstall == true) + std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl; + + // the dependency is critical, but can't be installed, so discard the candidate + // as the problemresolver will trip over it otherwise trying to install it (#735967) + if (Pkg->CurrentVer != 0) + SetCandidateVersion(Pkg.CurrentVer()); + return false; + } + } + return true; } /*}}}*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index bde648c65..bec651279 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -506,6 +506,8 @@ class pkgDepCache : protected pkgCache::Namespace // methods call by IsInstallOk bool IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, bool const AutoInst, unsigned long const Depth, bool const FromUser); + bool IsInstallOkDependenciesSatisfiableByCandidates(PkgIterator const &Pkg, + bool const AutoInst, unsigned long const Depth, bool const FromUser); // methods call by IsDeleteOk bool IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg, diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable index 4dbe1d25d..e9f3bf96d 100755 --- a/test/integration/test-bug-735967-lib32-to-i386-unavailable +++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable @@ -12,6 +12,9 @@ insertpackage 'unstable' 'libnss-mdns' 'amd64,i386' '0.10-6' 'Multi-Arch: same Breaks: lib32nss-mdns (<< 0.10-6)' insertpackage 'unstable' 'libnss-mdns-i386' 'i386' '0.10-6' 'Multi-Arch: foreign Depends: libnss-mdns' +# introduce some dummies so that there are versions, but none works +insertpackage 'unstable' 'libnss-mdns-i386' 'amd64' '0.1-6' +insertpackage 'experimental' 'libnss-mdns-amd64' 'i386,amd64' '0.10-6' 'Provides: libnss-mdns-i386' insertpackage 'unstable' 'foo' 'amd64' '1' 'Depends: libfoo' insertpackage 'unstable' 'libfoo' 'amd64' '1' 'Depends: libfoo-bin' -- cgit v1.2.3